From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Wed, 11 Oct 2017 09:28:36 +0000 (+0900)
Subject: Merge branch 'devel/master(1.2.60)' into tizen_4.0
X-Git-Tag: accepted/tizen/4.0/unified/20171012.230031^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F154832%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master(1.2.60)' into tizen_4.0

Change-Id: I359e9193e6b0ed7549d152a27321ba4269ed2d59
---

79aa4082b54e262fba5c7b639b736ec0af4ac673