Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7 am: 1d692218d3
authorPyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
commit96a56feb11ccbee80509f294630b9def1e091c7b
tree7eb91e3f58de16f0073d9cc7fc8a72fba487ca2f
parent6ae5082e37ddc6d49236c2d6e077c8576080edab
parent927151c175f072d836e9c4010e2664861a788d2e
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7 am: 1d692218d3
am: 927151c175

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