From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Wed, 26 Aug 2015 10:15:26 +0000 (+0100)
Subject: [dali_1.1.1] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~177
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F46824%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Ie82817e14cd7ae8a260538acd8b7c9584675f27e
---

8da6b8a945b6a24dfa03f55ae4f2ad36e4bdf6f8