Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 01:25:44 +0000 (17:25 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 01:25:44 +0000 (17:25 -0800)
Change-Id: I3d62340294affc97744a3f215a96d00bd47342d5

1  2 
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp