Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 18 Jun 2017 14:42:18 +0000 (16:42 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 18 Jun 2017 14:42:18 +0000 (16:42 +0200)
Change-Id: I139603a8755afc3a543fffa4b8035070fb40d297

1  2 
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
external/vulkancts/mustpass/1.0.2/src/master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/mustpass/1.0.3/vk-default.txt

diff --cc AndroidGen.mk
Simple merge
Simple merge