From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 16 Oct 2017 02:23:45 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen_4.0
X-Git-Tag: accepted/tizen/4.0/unified/20171017.212913~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=339c4fcd0375b4f45cae46664b95c75e8eb1ac22;hp=339c4fcd0375b4f45cae46664b95c75e8eb1ac22;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into tizen_4.0

Change-Id: I984cd2786a7a7dce687833cac4f719b65d57b53b
---