Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:00 +0000 (12:45 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:00 +0000 (12:45 -0800)
Change-Id: Ie32dbd8413b31f354882b5e114c281af4a9532eb

1  2 
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt

Simple merge