From: Tom Robinson <tom.robinson@samsung.com>
Date: Fri, 9 Oct 2015 09:49:23 +0000 (+0100)
Subject: [dali_1.1.6] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F49236%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Idd8bc6beeb4fd5e1253ae19e6227abebd4883c18
---

eaa55256641593c18c3480c843a11ae74effd0d5