From: Jinho, Lee <jeano.lee@samsung.com>
Date: Mon, 17 Apr 2017 07:56:42 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170418.072447^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4daf745d7e34dd0c18ec86e0afc3b3cbe918947;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I0a9f37f406f8ffdeba1fcd594fa46211f8583844
---

a4daf745d7e34dd0c18ec86e0afc3b3cbe918947