From: Heeyong Song <heeyong.song@samsung.com>
Date: Fri, 18 May 2018 01:35:34 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180521.003551~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F179444%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: Ibb1b392c4ae816e40ee6c579116cda0982943ef9
---

75ac3cf4b0413309cccaf2c262f20b3635eae6c7