From: Xiangyin Ma <x1.ma@samsung.com>
Date: Thu, 20 Nov 2014 13:14:04 +0000 (+0000)
Subject: [dali_1.0.18] Merger branch 'tizen'
X-Git-Tag: dali_1.9.21~292
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F76%2F30576%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[dali_1.0.18] Merger branch 'tizen'

Change-Id: I84bbac2d34d178c840c3e585f4db81428e2a7ab1
---

4816b9d79551b35fe507d1d99ff3025a0234209b