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

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

Change-Id: I10c5967ddf6820698bbd18260cfa08fc3d2f7bee
---

e542393b2651a05921e861f0440d83d10997f760