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

Merge branch 'devel/master' into tizen

Change-Id: Idf8019b23a2d2f00c2f954dbf8f24d59e8a44371
---

02ecaf0ebaf2fb4512f8f57190840812b98730d4