From: Chu Hoang <c.hoang@samsung.com>
Date: Fri, 2 Oct 2015 09:39:09 +0000 (+0100)
Subject: [dali_1.1.5] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~251
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F48978%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: I8fb10ef87ae58259188b1d3164f86e2efdabd533
---

4f32d658dffcb42d6620e8375e9a85ad7deb7582