From: Nick Holland <nick.holland@partner.samsung.com>
Date: Thu, 22 Jan 2015 10:49:08 +0000 (+0000)
Subject: [dali_1.0.26] Merge branch 'tizen'
X-Git-Tag: dali_1.4.10~207
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40caab9ac26b3b2290e3c3d7dd33eef3bdc1bd11;hp=-c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.26] Merge branch 'tizen'

Change-Id: Ibf0f060faa8b643b65f5cc0cbb63b96819a98dac
---

40caab9ac26b3b2290e3c3d7dd33eef3bdc1bd11