Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 17:58:17 +0000 (18:58 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 17:58:17 +0000 (18:58 +0100)
commite82ee89d7eefe7084d2565e3f3692d2cfa25b083
treecc52736c3793b2585b5dc115bf890969428a07ff
parenta0293dd7a8ccce360306a99781e5f9c0a34ea1ef
parentb8a5c96b5ebb21a9789671d0b2144ec5d92226a2
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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