From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 14 Nov 2017 01:21:24 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: submit/tizen/20171115.054905
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f01fe9d7bbcc0aabfe4908b08fcc2fb8323ef9e1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I1b50e5122be9c9229a012306b59f4503f95411b5
---

c5e5d3a8637bdb9f31bced4558943d2965fdd37c