Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:06 +0000 (04:24 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:06 +0000 (04:24 -0800)
commit7e7d01a2315e89f50e5627a63bc99e32258dfafc
treec30dcb367d28c49b5cfbf60b112038782b286be3
parent7d84129f76e9c2eb6fa15fc4a5cfef9d14b330c6
parent3fcee68a30841ded9ee613217ea3240dda0b6c8f
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions

Change-Id: I21809d36efcb31d4a1c8b8fc9804653c87efad5f
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt