Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 4 Feb 2019 12:10:18 +0000 (13:10 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 4 Feb 2019 12:10:18 +0000 (13:10 +0100)
Change-Id: I9934155193938f026ba0164995523eef96317e3d

1  2 
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.4/vk-default.txt

Simple merge