From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 20 Jun 2017 07:51:13 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170630.083235~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F134885%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch 'devel/master' into tizen

Change-Id: I61c6723291e2e9af475e6ed454b1125936f7eebc
---

8c1ef2332d621b8a875e54f4e5923b83134b497a