From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 2 Jun 2017 11:56:48 +0000 (+0100)
Subject: [dali_1.2.42] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F132364%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I96af28a60865083861d7723e9c7583274974513c
---

de1fd913be651474ecbcc5212f0a331f0803ac48