Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 7 Dec 2018 12:42:23 +0000 (13:42 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 7 Dec 2018 12:42:23 +0000 (13:42 +0100)
Change-Id: I6b9a7542624d1899ed00f694e7f87c1a40252280

1  2 
AndroidGen.mk
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

diff --cc AndroidGen.mk
Simple merge