From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 6 Oct 2017 15:55:02 +0000 (+0100)
Subject: [dali_1.2.60] Merge branch 'devel/master'
X-Git-Tag: submit/trunk/20181001.110911~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F154137%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

Change-Id: Iab54cf5acca439b4739f6c1e4aca6a51cfdeb1bc
---

535b79b009584a50ba73f2a01b553108eefc4488