Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 43e50db72d am: ae92b0c427...
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 18:40:45 +0000 (18:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 18:40:45 +0000 (18:40 +0000)
am: f50a42b81b

Change-Id: Ie89b0b375024e2f9b1ad6c2dade3f602a58dd431

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