From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 21 Oct 2016 14:10:04 +0000 (+0100)
Subject: [dali_1.2.11] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~121
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F93319%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I346006b79d13c0012d9a5c8fa86e524a22dc012b
---

4cd0c17c9421378d74fe95d1bd2970d84a9d9453