From: adam.b <adam.b@samsung.com>
Date: Fri, 29 Nov 2019 12:18:05 +0000 (+0000)
Subject: [dali_1.4.48] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F219005%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I31d583aabec5020287b64f4d11307dc2e1561ad6
---

cc023bc86a9165b2cde066acc09d42313f4aca39