Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 12:28:41 +0000 (13:28 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 12:28:41 +0000 (13:28 +0100)
commita0293dd7a8ccce360306a99781e5f9c0a34ea1ef
tree1131ce8336c9d498a7c96bd11b00b41ea15b5193
parent5b9ef1e946ea1fede4cbb05e232f24cd1b83dd88
parentb035c45c94150c03792d72b8d0e7b045a9cbf410
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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