From: dongsug.song <dongsug.song@samsung.com>
Date: Fri, 31 Mar 2017 05:57:03 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20170403.185636^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_tv;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into tizen

Change-Id: If12fb6560b14a3d83693d4135c4e2d3530ccc55e
---

0fb488b9861d0539e9ea6d8dbc1cee05faedf508