From: minho.sun <minho.sun@samsung.com>
Date: Thu, 9 Feb 2017 02:23:04 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20170223.182657~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F113812%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I6947f0c77b5e9925ad966bc8d7004d8a72ba61dd
---

b94540523c4e8585fa749fd8b508dccced78ea37