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)
am: f1fdce7bb4

Change-Id: I7f8fe0132462c5c50565c43cf32beaf0aa360300

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