From: adam.b <adam.b@samsung.com>
Date: Fri, 21 Apr 2017 11:30:48 +0000 (+0100)
Subject: [dali_1.2.36] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~96
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=a7a16401984febfe04f4f0b4846c0c77540b9ba6

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

Change-Id: Id7712a06c89d3d0edc170efdd297f7fba441652a
---

a7a16401984febfe04f4f0b4846c0c77540b9ba6