From: Heeyong Song <heeyong.song@samsung.com>
Date: Fri, 18 May 2018 00:57:41 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180521.003535~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=92f60124b92e64ffb911a071e5493d3248ebf5ef

Merge branch 'devel/master' into tizen

Change-Id: Iab41124b9e91f6bdb53029a467d220611988f96f
---

92f60124b92e64ffb911a071e5493d3248ebf5ef