From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 12 Feb 2016 10:32:57 +0000 (+0000)
Subject: [dali_1.1.21] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c8b97b68dd1e90533ce8b8da3b074fccf8285d7;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: Id137cbb4ac3a596ca7ef8d2b32c5889dd867202b
---

7c8b97b68dd1e90533ce8b8da3b074fccf8285d7