Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 1 Dec 2016 22:23:56 +0000 (14:23 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 1 Dec 2016 22:23:56 +0000 (14:23 -0800)
commit1d1979f64cd466a51d1f6c217c4d9e614ca38d76
tree89786a639cc2b34d0e34d56e96ef943d965e4839
parentc909ad463022dd98c7b437dfc80c7d5ade82db01
parentafee256c771d752770e20a15a3446c5c5b1dcde8
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

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