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)
Change-Id: I21809d36efcb31d4a1c8b8fc9804653c87efad5f

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

Simple merge