From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 20 Jun 2017 07:53:43 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170630.083238^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=6dd32aa6423caf90a80931549f3df68e4b7f6910;hp=c5c60701c32070a5e9d40352be29012e76f271f3

Merge branch 'devel/master' into tizen

Change-Id: I282e9246428bec920ffe577cf33f0b63e930f48a
---