From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 30 Jan 2018 06:48:07 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180206.064208^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57ea2ae0019f00f1ef9858764b7baac6d62c4cd2;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I86a4b92b9dbbf954dde5c4b5ebe50ff3885bfa75
---

57ea2ae0019f00f1ef9858764b7baac6d62c4cd2