From: minho.sun <minho.sun@samsung.com>
Date: Fri, 22 Jun 2018 01:09:46 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180622.122736~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20d135f6ee7ac35ffc552f85b21c7e218cdf170c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: Ia901c87ac96c3072f00bdfd0fde9843699740a73
---

20d135f6ee7ac35ffc552f85b21c7e218cdf170c