Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)
commit68408cad8f37333a80caffb20383c07562131a16
tree20534e4ccefcc8e118b27ccf961290d56e4f7061
parenta6f61be6c31f33d7621343eedf34f3f50b2c32ad
parent319e6ccec333bd541bbc16f7300aa5fc0e3fceb6
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Ifee45dee9fe57a8386c468dfedfb822c329f2504
Android.mk
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp