From: Heeyong Song <heeyong.song@samsung.com>
Date: Thu, 10 May 2018 06:52:10 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180514.094036~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=94e6f971c1e84acc6433b40cf2d9513db427ca34

Merge branch 'devel/master' into tizen

Change-Id: Ie5121d08bd785adf6f67d81fdfb22ab0ce940087
---

94e6f971c1e84acc6433b40cf2d9513db427ca34