From: David Steele <david.steele@samsung.com>
Date: Fri, 12 May 2017 12:43:25 +0000 (+0100)
Subject: [dali_1.2.39] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F129049%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I1dc9751c9631376e030c7376adee6092ada4e9e7
---

d83ad9c44e949249ef76c20b2379b0c7cec6d4a4