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

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

Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)

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

Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)
diff --cc android/cts/master/src/vk-master-2019-03-01.txt
Simple merge
diff --cc android/cts/master/vk-master-2019-03-01.txt
Simple merge
diff --cc android/cts/master/vk-master-2020-03-01.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 21 Apr 2021 06:56:03 +0000 (09:56 +0300)
		1	2
android/cts/master/src/vk-master-2019-03-01.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master-2019-03-01.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master-2020-03-01.txt	patch \|	diff1 \|	diff2 \|	blob \| history