From: Jinho, Lee <jeano.lee@samsung.com>
Date: Tue, 4 Jul 2017 05:53:51 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170706.193941^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F137170%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I467bb25b8bb25bdaf5d69372e8815a2d9504f17c
---

6efaf1828e4baaa4463670eb51d455be7f53f6e7