From: Victor Cebollada <v.cebollada@samsung.com>
Date: Fri, 24 Jun 2016 07:53:34 +0000 (+0100)
Subject: [dali_1.1.40] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18ed895cb14acd1a86efe58127a8a5880ff8a51f;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Ib300a2a65815251cbfcaf84c3c1fc151064d9d8f
---

18ed895cb14acd1a86efe58127a8a5880ff8a51f