Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/master

author Alexander Galazin <alexander.galazin@arm.com>

Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)

committer Alexander Galazin <alexander.galazin@arm.com>

Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)
diff --cc AndroidGen.mk
Simple merge
diff --cc android/cts/master/vk-master-2020-03-01.txt
Simple merge
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 19 Mar 2020 10:20:22 +0000 (11:20 +0100)
		1	2
AndroidGen.mk	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master-2020-03-01.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history