Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

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

Thu, 6 Sep 2018 16:35:42 +0000 (18:35 +0200)

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

Thu, 6 Sep 2018 16:38:42 +0000 (18:38 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 6 Sep 2018 16:35:42 +0000 (18:35 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 6 Sep 2018 16:38:42 +0000 (18:38 +0200)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp
Simple merge
diff --cc external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 6 Sep 2018 16:35:42 +0000 (18:35 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 6 Sep 2018 16:38:42 +0000 (18:38 +0200)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/tessellation/vktTessellationPrimitiveDiscardTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt	patch \|	diff1 \|	diff2 \|	blob \| history