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:41:09 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 23:41:09 +0000 (23:41 +0000)
am: 96a56feb11

Change-Id: Idebdf8b5419468831f8e2667c6e50d1bcbc2c426

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