Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 26 Oct 2018 07:38:23 +0000 (09:38 +0200)
commitd6ebd46eb4fb67956a7db9356f6818afc045fb4a
tree7e912e634ace2b502c47cca821d81ee4ac737236
parenta83c04cd2f258fbce81ddbaa10f1e5ae092deb8b
parentfc00c27d285b48b4c233bb79e07a6df5e6082e90
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6a27bf242fd8721dbd2a44528371686b857d0654
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt