Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000 (16:32 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000 (16:32 -0800)
Change-Id: Iad6867155d0e94a63b4dfd259f17a811baab5520

1  2 
Android.mk
external/vulkancts/modules/vulkan/draw/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

diff --cc Android.mk
Simple merge