From: Xiangyin Ma <x1.ma@samsung.com>
Date: Thu, 15 Jan 2015 13:21:21 +0000 (+0000)
Subject: [dali_1.0.25] Merge branch 'tizen'
X-Git-Tag: dali_1.9.8~5^2~263
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3ac55f31db4ac83cd33791383339c9f0874ea10b

[dali_1.0.25] Merge branch 'tizen'

Change-Id: Ib645018b21702614804b85fd97e2e4489a81d194
---

3ac55f31db4ac83cd33791383339c9f0874ea10b