Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Feb 2019 11:51:31 +0000 (12:51 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Feb 2019 11:51:31 +0000 (12:51 +0100)
commit7a6aa926b20eacc755692795325e2d83358c28f5
tree1952c2bacf4cb076a5c067dbb43dfe4206e4aecc
parent41e1ab825e3801e485683dec9f8dbd6d72d62b51
parent63a536888b9d3bd5033fa528af0c33de6babb8ec
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ia4af011fb6cb9b77a4bf44d3b27333da12d8a199
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.4/vk-default.txt