From: taeyoon <taeyoon0.lee@samsung.com>
Date: Tue, 9 Aug 2016 12:02:47 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.0)' into tizen
X-Git-Tag: accepted/tizen/common/20160830.150437~11
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=90d6335a8d5a806e166ba218a8f6bc2d794c85c5

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

Change-Id: Ia802c3b17b32c21222ea6c8d9cd13d6ad6bc99ea
---

90d6335a8d5a806e166ba218a8f6bc2d794c85c5