From: Chu Hoang <c.hoang@samsung.com>
Date: Wed, 24 Jun 2015 14:54:53 +0000 (+0100)
Subject: [dali_1.0.46] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~264
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F42238%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[dali_1.0.46] Merge branch 'devel/master'

Change-Id: Ibaeb4162395c0f3c4e9f62ede4cdec5af82cc4c4
---

45a1914d7dea8f01033024dcf56513967a1bd0ff