From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Wed, 8 Oct 2014 10:15:00 +0000 (+0100)
Subject: [dali_1.0.12] Merge branch 'tizen'
X-Git-Tag: dali_1.0.14~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0c233561ca7f46175803f0ea02b4638bf42ee3c9

[dali_1.0.12] Merge branch 'tizen'

Change-Id: I960227afa2ef3ad4c230ef34830e480b267583c9
---

0c233561ca7f46175803f0ea02b4638bf42ee3c9