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

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

Change-Id: Ibec3ad9a5bb9cfe60d7ca9bf4cbd0f3888b0d918
---

007c58ff4b0705ba6bc61115e53b6a396ab22aa3