From: Umar <m.umar@partner.samsung.com>
Date: Fri, 3 Feb 2017 15:38:27 +0000 (+0000)
Subject: [dali_1.2.25] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F113018%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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

Change-Id: I86f3f01af8119a79e5fa52be58875822f90780c9
---

969855f52a7c30ea6309d41b416100b47161bc66