From: Nick Holland <nick.holland@partner.samsung.com>
Date: Thu, 13 Nov 2014 11:28:19 +0000 (+0000)
Subject: [dali_1.0.17] Merge branch 'tizen'
X-Git-Tag: dali_1.4.10~216
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F30270%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.17] Merge branch 'tizen'

Change-Id: I859f215053698ae32a68181dc77f5d4e8cacc4fc
---

5ab4e968a037be9b4beb8c3864acee2b3ec8c006