From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 2 Jun 2017 11:56:12 +0000 (+0100)
Subject: [dali_1.2.42] Merge branch 'devel/master'
X-Git-Tag: submit/trunk/20181001.110911~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ab969fbd5e091f206a3407f7da115aaf103d3cc;hp=198c199bbd9d751eddd478c4fbf39b864c25c0b6;p=platform%2Fcore%2Fuifw%2Fdali-core.git

[dali_1.2.42] Merge branch 'devel/master'

Change-Id: I7f18c98827816533d93a463b54028147d1b8f271
---