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

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

Change-Id: Iea3cd13f956b3aa0ace7ac97b78b4f215a3f93e7
---

269f620ad9d5a8c816a03278ce6f65fe7862582e