Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 18:24:39 +0000 (10:24 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 18:24:39 +0000 (10:24 -0800)
commit5db11637308790a089038f5dd6272d1689a79ae7
tree54a37c785d57afc77bee8ada06dc4dc9c2da01d4
parentd12b2db2992342bcf87f9d82dfefe118cde28953
parent9e849a501764433e9aed3c658bba305d081c424c
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

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