From: minho.sun <minho.sun@samsung.com>
Date: Wed, 7 Jun 2017 05:55:54 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170608.072242~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=dee919a69ffd53838d5bff1ec81c23f499dae13b

Merge branch 'devel/master' into tizen

Change-Id: I88623c69468ba25730b9265dbd9a0bad1b803ee7
---

dee919a69ffd53838d5bff1ec81c23f499dae13b