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

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

Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)

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

Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
diff --cc AndroidGen.mk
Simple merge
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
Simple merge
diff --cc external/vulkancts/mustpass/1.1.3/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
		1	2
AndroidGen.mk	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.3/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history