From: Nick Holland <nick.holland@partner.samsung.com>
Date: Thu, 22 Jan 2015 10:48:52 +0000 (+0000)
Subject: [dali_1.0.26] Merge branch 'tizen'
X-Git-Tag: dali_1.9.21~284
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F34256%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[dali_1.0.26] Merge branch 'tizen'

Change-Id: I411d40108033a927691c31f73de76fc6d8eeb47b
---

ff78ee214a0617ee31205530f13f910ced4136f4