From: Alexander Galazin <alexander.galazin@arm.com>
Date: Fri, 8 Sep 2017 08:58:26 +0000 (+0200)
Subject: Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
X-Git-Tag: upstream/1.3.5~2565^2~148
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50623490b5d19c4c3b7eff515bbc4623c74e1c76;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: Ia7b82ce3609ab3ab3669f43c9f14a50fd5977ec3
---

50623490b5d19c4c3b7eff515bbc4623c74e1c76
diff --cc android/cts/master/vk-master.txt
index 4fd456a,72a4523..37ec163
mode 100755,100644..100755
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
diff --cc external/vulkancts/mustpass/1.0.3/vk-default.txt
index 7994f48,9dcd3fb..f4f4e66
mode 100755,100644..100755
--- a/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt