From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 6 Oct 2017 15:55:23 +0000 (+0100)
Subject: [dali_1.2.60] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~127
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=410125f32fcd135226a2a0a668b2855ea9e17a69

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

Change-Id: I2994fa2040564870d0ef207f388c2cdb48acb09b
---

410125f32fcd135226a2a0a668b2855ea9e17a69