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

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

Change-Id: I9337e1e473272ba38bcf735ad57b3c4725f6c22b
---

6a96ce4b626cfde1cf98814745acd9024f9c405a