From: Xiangyin Ma <x1.ma@samsung.com>
Date: Thu, 20 Nov 2014 13:17:05 +0000 (+0000)
Subject: [dali_1.0.18] Merger branch 'tizen'
X-Git-Tag: dali_1.4.10~215
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f464a46f817893abd1f22e1f0cf27cbded5c8d0;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.18] Merger branch 'tizen'

Change-Id: I99523960cc013dbe9f170a7269d162b54f7a1cb9
---

2f464a46f817893abd1f22e1f0cf27cbded5c8d0