From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Jun 2017 01:34:06 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170614.141242~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F133555%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge branch 'devel/master' into tizen

Change-Id: Ida6fec1f6183b5c47431c352a5955dc9f0616034
---

f797020286aa82bac8afdd6a8c0fb6dcb2326781