From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 27 Mar 2017 01:38:36 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20170327.143307^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F120940%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge branch 'devel/master' into tizen

Change-Id: I1f8e678f96f49ddde05e85cdbad1a357ef8ef100
---

5423c4b15c35798056e3f6a3af8d0275105e9517