Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

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

Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)

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

Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)
diff --cc android/cts/master/src/vk-test-issues.txt
Simple merge
diff --cc android/cts/master/vk-master.txt

index d4e173d,14be96c..ee15423

mode 100644,100755..100644
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
diff --cc external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 1 Oct 2019 10:36:16 +0000 (12:36 +0200)
		1	2
android/cts/master/src/vk-test-issues.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history