From: adam.b <adam.b@samsung.com>
Date: Fri, 21 Apr 2017 11:30:10 +0000 (+0100)
Subject: [dali_1.2.36] Merge branch 'devel/master'
X-Git-Tag: submit/trunk/20181001.110911~73
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F126448%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

Change-Id: Ibf74b4a3a70d6744d273463c83fa5ffa3a03c795
---

5ff7b9d254e6c4f623df42c07d1ac8abaabd8699