Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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

Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)

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

Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
Simple merge
diff --cc external/vulkancts/mustpass/1.1.2/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.2/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history