From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 12 Aug 2016 10:41:36 +0000 (+0100)
Subject: [dali_1.2.1] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~186
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=80f435f8608fa1604f597a5620c9e6ea137f8e0a

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

Change-Id: I911142b201fcc91fecf8554c9dd441a706103ebe
---

80f435f8608fa1604f597a5620c9e6ea137f8e0a