From: adam.b <adam.b@samsung.com>
Date: Fri, 14 Jul 2017 12:30:22 +0000 (+0100)
Subject: [dali_1.2.48] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~84
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=08852f39e92948ae06e70c8ce2c65351a1308e40

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

Change-Id: I3c31aed793ca79db87198c3e0fd6736b48e0137a
---

08852f39e92948ae06e70c8ce2c65351a1308e40