From: taeyoon <taeyoon0.lee@samsung.com>
Date: Fri, 15 Jan 2016 04:48:58 +0000 (+0900)
Subject: Merge branch 'devel/master( 1.1.16 )' into tizen
X-Git-Tag: accepted/tizen/common/20160208.162649^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F57081%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Icda90c6813e7942899e915913ccb6443fbeae492
---

bf11e4d38d39db2fecd7d782fd8a9e26a8fa8305