From: Sunghyun kim <scholb.kim@samsung.com>
Date: Mon, 2 Jul 2018 05:52:56 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180703.062127~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=05d2ab2e1b9f24c98e8d82e5eb2c5589ad5d4b8e

Merge branch 'devel/master' into tizen

Change-Id: If68846e259c1d52265ae55cdf6d40bf28997e2fb
---

05d2ab2e1b9f24c98e8d82e5eb2c5589ad5d4b8e