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

Change-Id: I33d13e009d97558145ba7d8908a8117fcfe3b377

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