From: minho.sun <minho.sun@samsung.com>
Date: Fri, 22 Jun 2018 01:29:36 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180622.122731~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F182311%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch 'devel/master' into tizen

Change-Id: If0713f4d32f254deabe65d7b41f4b0b654aa43e5
---

4a934f0b381b1345fd0086a1d397662c51ec12e4