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

Merge branch 'devel/master' into tizen

Change-Id: Ief7454e4e1d1604ddbbffd38ccbf8e4defc93b3b
---

b1f0e19e8e095303300b93035b7ce609734921eb