From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 5 Nov 2018 08:32:00 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/5.0/unified/20181106.070402~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=d1b7007e9db522c1c119d53ed8457c902f24231b

Merge branch 'devel/master' into tizen

Change-Id: I0cb443d92acce4be7ae55c5a903a47666d09eb16
---

d1b7007e9db522c1c119d53ed8457c902f24231b