From: Richard Huang <r.huang@samsung.com>
Date: Fri, 18 Mar 2016 13:10:29 +0000 (+0000)
Subject: [dali_1.1.26] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F62826%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: I1f513b64323cdb36173cbae8acc805b5c80741d6
---

b76828af1c258f08c2a49e229b975f3faa66a70b