From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Fri, 23 Oct 2015 10:01:09 +0000 (+0100)
Subject: [dali_1.1.7] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F50040%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Icf5d9e2bffe4d282c415a2b48b41ab562fc4fb81
---

fc74c49e34fbe0ba1dc3c5d86302e5cd3436e2ac