From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 16 Oct 2017 05:03:20 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen_4.0
X-Git-Tag: accepted/tizen/4.0/unified/20171017.212923^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3f53530259c033b086f8ef9989b1d7857cf5a91;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen_4.0

Change-Id: I1135ff681a7f303dcdd44716ef968b2c24a1ddf8
---

d3f53530259c033b086f8ef9989b1d7857cf5a91