From: minho.sun <minho.sun@samsung.com>
Date: Tue, 1 Aug 2017 01:14:38 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170809.015320^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=505ebf6925e63c51350b8d730f4fe741e1f03d79;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: I399c2bffd2cbfad7207c31ccc286dd3911d5113a
---

505ebf6925e63c51350b8d730f4fe741e1f03d79