From: minho.sun <minho.sun@samsung.com>
Date: Mon, 21 Mar 2016 02:50:22 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/tv/20160323.135440
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Ftv%2F20160323.135440;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch 'devel/master' into tizen

Change-Id: Ia1ba67611e0706f9d95d79c4f042234b6a18f200
---

46165745c5b8db3658ff621b9ccc2ac74e704e03