Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:34:46 +0000 (12:34 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:34:46 +0000 (12:34 -0800)
commit47d74e847e9f4f77d2dedef7bb36045e8e4c83a1
treea91ebdc1b841ab685c0e3745c70a3578d02e9bf2
parent7c1eed0087805f09a1c6b2d883285afe8c6cc19f
parent9cf974b0f6bc3970ffad052cbf2340758d5c7d8b
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

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