From: huiyu.eun <huiyu.eun@samsung.com>
Date: Mon, 9 Apr 2018 10:24:52 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180412.073732^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=438a377bc9f4a2d55811de3a6717cbded5ec1f78

Merge branch 'devel/master' into tizen

Change-Id: Ibf669e7cbdc3248b234c875ec59dfde251946a64
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---

438a377bc9f4a2d55811de3a6717cbded5ec1f78