Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a...
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 00:17:26 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 00:17:26 +0000 (00:17 +0000)
commit3dbc293d8b3a0b4cc4fa8b8fe186a7877e0de9dd
tree87e53baf9d6105e70426bb1e2aff213e595323d1
parent8c42018db1aed6d490997ed5444d058c6e93839a
parentf1fdce7bb4407fac9fb6a46a9b3f2a60da55b2b1
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a am: d1438e5585
am: f1fdce7bb4

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