From: Agnelo Vaz <agnelo.vaz@samsung.com>
Date: Fri, 8 Jul 2016 16:44:14 +0000 (+0100)
Subject: [dali_1.1.42] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F79206%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.1.42] Merge branch 'devel/master'

Change-Id: I904cf0c597f9e16c83518e805099ae3cd34f3be6
---

a70ecbcb1da52ba43a31e6412d7e476e74338a2e