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

Merge branch 'devel/master' into tizen

Change-Id: I8edb9525b2a2cf1ab7ba31684667eb088e6b6919
---

ad3cef136eccf053768fa1d1e6b85be153a3d487