From: Xiangyin Ma <x1.ma@samsung.com>
Date: Thu, 15 Jan 2015 13:21:26 +0000 (+0000)
Subject: [dali_1.0.25] Merge branch 'tizen'
X-Git-Tag: dali_1.4.10~208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F33847%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.25] Merge branch 'tizen'

Change-Id: Icf5bae36799179a57d8f4dd0c8e479b3058afe77
---

59c9c4c08d372314099f24b569e343f487483e4c