Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:13 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:13 +0000 (16:20 -0800)
commit7933bd9481216a4f5b3c15341b6a593d750d59d6
treeccf8f0e8b51ac93c64bef5d00825a98209ec580d
parent55e88b15b0983b2fc5d3fa9d5507a50e864602bc
parent73d2ed7239e503a6c129cfa93f89dd463cb23398
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions

Change-Id: I0245ac0051e69ab290b13c06deb505115209ee27
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/mustpass/1.0.2/vk-default.txt