From: Heeyong Song <heeyong.song@samsung.com>
Date: Fri, 1 Sep 2017 00:25:59 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen_4.0
X-Git-Tag: accepted/tizen/4.0/unified/20170907.192416~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F147035%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge branch 'devel/master' into tizen_4.0

Change-Id: I5d7600385ce3019adc228c201fd42611373f038e
---

4ead2cb231e0e3c3d9871e3ece1eff793b5810f5