From: minho.sun <minho.sun@samsung.com>
Date: Tue, 1 Aug 2017 01:09:27 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170809.015316~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6848561111e2c61f934b4c51e7671a9596c954b4

Merge branch 'devel/master' into tizen

Change-Id: Ia57226a428e157e736be05fd313fb725d2f8fde1
---

6848561111e2c61f934b4c51e7671a9596c954b4