From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 2 Jun 2017 11:56:33 +0000 (+0100)
Subject: [dali_1.2.42] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~145
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=30b39930a88d3d44cfea9a969c742d662666b149

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

Change-Id: Iee4b624e159ad90653e6eb602ee0da0187db4054
---

30b39930a88d3d44cfea9a969c742d662666b149