Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 18:40:39 +0000 (10:40 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 18:40:39 +0000 (10:40 -0800)
Change-Id: I75424d6c9c89f70907edba466f96101da06d0ce3

1  2 
Android.mk
external/vulkancts/modules/vulkan/memory/CMakeLists.txt
external/vulkancts/modules/vulkan/texture/CMakeLists.txt

diff --cc Android.mk
Simple merge