From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 19 May 2017 12:44:19 +0000 (+0100)
Subject: [dali_1.2.40] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~92
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F130232%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Ia9e79d501711ea2deacb5bb2c18e8b67f39f2993
---

0ee36c9ea82c061d8306bdd2c5bf99b9089bd631