Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 30 Aug 2016 18:17:28 +0000 (11:17 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 30 Aug 2016 18:17:28 +0000 (11:17 -0700)
commit4bc204a4d00b79d1a981e8890c296358a86d2493
tree8091a67c4cd333cc7169446622da77a9f8c9bc00
parentb185bd68a407b77b013ac630e4071cec2ff8b345
parent3171c745879cd1a3d68f09094eb3fb05505fc74c
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev

Change-Id: Id91a7898a30bf08bf992e89b597f73e336494252
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/vktTestPackage.cpp