Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a
authorPyry Haulos <phaulos@google.com>
Thu, 22 Sep 2016 23:23:30 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 23:23:30 +0000 (23:23 +0000)
commitf1fdce7bb4407fac9fb6a46a9b3f2a60da55b2b1
treeb4c3297cccf6a6e94387ba06e30433ce591c430d
parent2ffe1e252e97aaac6952781ca715a7e4c7ca9c63
parentd1438e5585cfd05585b7d90a52f00bdbbb01ddb1
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a
am: d1438e5585

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