From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 20 Aug 2018 05:05:50 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180820.153919~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=679c9dc57beee80411d05489eafbc0f550088da3;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge branch 'devel/master' into tizen

Change-Id: I14a31ace7454080e23eb17028ddacbadaa4190a8
---

679c9dc57beee80411d05489eafbc0f550088da3