From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 28 Jul 2017 15:55:30 +0000 (+0100)
Subject: [dali_1.2.50] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F141231%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: I8821ef6744f09fc5403f415e9b7883a3d01f131b
---

5040a99306f04a54a8c9941119b296d964246f77