From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 9 Apr 2015 10:53:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: dali_1.0.38~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F38004%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Id894a3d5d460cd4fb22d9bb25559bd2173df0e54
---

5f9a06a1957e64365f9afea76ea4add885a1c841