From: minho.sun <minho.sun@samsung.com>
Date: Fri, 22 Jun 2018 01:09:01 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180622.122727~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=ad9c30c225f7f4fa4da639ca1e5153936720f9f7

Merge branch 'devel/master' into tizen

Change-Id: I1c7841144f6a8a0eebd3a5436fd9d71a1b4dea43
---

ad9c30c225f7f4fa4da639ca1e5153936720f9f7