From: Alexander Galazin <alexander.galazin@arm.com>
Date: Fri, 15 Sep 2017 14:10:37 +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~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=858f9096bb24d73afdb1839652673ecfc5423a92;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: I6dc9711a5bb8fe51b961e3c7983f09482f98113c
---

858f9096bb24d73afdb1839652673ecfc5423a92
diff --cc android/cts/master/vk-master.txt
index 16b10f7,2cc1a1c..dfdedb1
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 2a80485,45f7bf4..6c3ba48
mode 100755,100644..100755
--- a/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt