Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:31 +0000 (12:18 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:31 +0000 (12:18 -0800)
Change-Id: I9149408b579c01cd5d7c16bdcdf408aae6819501

1  2 
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
external/vulkancts/mustpass/1.0.2/vk-default.txt

Simple merge