From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Jun 2017 02:12:56 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170614.141239^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=9947d82194051be5b15aa1f6101da413d2716af5;hp=1d1bf9cec3aa86c043ebb4ddbc61ee0916ec9e32

Merge branch 'devel/master' into tizen

Change-Id: I12c4d05cce521dcd28fa17e25f4fa540262564ea
---