From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 3 Apr 2015 05:51:46 +0000 (+0100)
Subject: [dali_1.0.36] Merge branch 'tizen'
X-Git-Tag: dali_1.4.10~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F37732%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.36] Merge branch 'tizen'

Change-Id: I932fde5506e5de977fc35a8156f2d1d2854d61c0
---

e47588a2c4b176b79b182da6906dae2f8b179910