From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 14 Aug 2017 06:38:19 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: submit/tizen/20170814.093340~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5469e2e206f4d9318a5dc435a0109eac4eb3cf84

Merge branch 'devel/master' into tizen

Change-Id: I5ddb44d0163b6d48a1578ec92413d9348c32b2fa
---

5469e2e206f4d9318a5dc435a0109eac4eb3cf84