From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 25 Sep 2015 07:46:40 +0000 (+0100)
Subject: [dali_1.1.4] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~174
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F48718%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I7f47ab256aadbcae617e5e4cf5d871ec1a2f669c
---

2cae846d16036e641287295af0c8557abd5b9617