From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 31 May 2018 18:05:08 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/vulkan
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdevel%2Fvulkan;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge branch 'devel/master' into devel/vulkan

Change-Id: I27b1a0d0103c15153c07f34a8cbf4e26060cdd16
---

8ac476f85a52fbf8e90d3287df314536aedb80cd