Merge branch 'devel/master' into devel/vulkan devel/vulkan
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:05:08 +0000 (19:05 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:06:49 +0000 (19:06 +0100)
commit8ac476f85a52fbf8e90d3287df314536aedb80cd
tree3953ec1e0eea267c2b3da51a77d0afa49b78e638
parent02a8a3d3de0c152eb659a83f02436cb84e6f0b95
parentd9acc7fa65fe8823e2001c7be5a5d1de70db2331
Merge branch 'devel/master' into devel/vulkan

Change-Id: I27b1a0d0103c15153c07f34a8cbf4e26060cdd16