From: dongsug.song <dongsug.song@samsung.com>
Date: Tue, 27 Mar 2018 11:02:30 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20180405.064358
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20180405.064358

Merge branch 'devel/master' into tizen

Change-Id: Id6f83cf258a07b1cf08f001bd6a60d6efca44e03
---

5fbb9e39fabb292daf6600dfdd4c637fe52faae2