From: David Steele <david.steele@samsung.com>
Date: Fri, 11 Dec 2015 14:42:37 +0000 (+0000)
Subject: [dali_1.1.14] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F54139%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I94f71cafbb9905ca9fbe6aee30a74be2fddd454f
---

2db41d48e4cf67acc19ff6b39d540e5c7edf0b07