From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 14 Aug 2017 09:15:10 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: submit/tizen/20170822.100117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen%2F20170822.100117;p=platform%2Fcore%2Fuifw%2Fdali-extension.git

Merge branch 'devel/master' into tizen

Change-Id: I4da7fee35759a303b5c1a55c55dbb46687d8b157
---

9cb7b3f1c42f27fab34568ac39c3f84de64d8abf