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

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

Simple merge