From: dongsug.song <dongsug.song@samsung.com>
Date: Wed, 4 May 2016 00:09:16 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20160509.135208^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F86%2F68386%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: Ie7b8cfa4cd8adee13b52fd3bb3ad09fa39bdd1fe
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
---

7374f93dc7855f4cc263601215c84aea8f7d276b