From: taeyoon <taeyoon0.lee@samsung.com>
Date: Sat, 18 Jun 2016 05:08:48 +0000 (+0900)
Subject: Merge branch 'devel/master(1.1.39)' into tizen
X-Git-Tag: accepted/tizen/common/20160620.163535^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F75419%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master(1.1.39)' into tizen

Change-Id: I7076a16a94447bccc18042662f1f92812a22a515
---

2cfafe99d72918b8b1326e0726b9b6ae8e0191f0