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)
commitdd398940da49b45f1d90829a354b4d44c2df6f3e
treeffcf4434e095b36b5c70ac268b319c1f1884460e
parent132a3ba810740a04905282dafefb6bc1caed8853
parent6562b6142107576db66860dfab57a59ac71b8ff9
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I3d62340294affc97744a3f215a96d00bd47342d5
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp