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)
commitae92b0c427f8d6586ebf83f36a6cafeeb6b23060
treef6f320a2b54d87aad081faf54e0a1d9504d522c3
parent8e32ffdbc24a9446ef8eb48f8a2762164679f195
parent43e50db72df53a0fe81af16ac164e8319a35a790
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am: 43e50db72d

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