Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174...
authorPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 23:23:15 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 23:23:15 +0000 (23:23 +0000)
am: 7de6e0f3dd

Change-Id: I68170be42e32cb4cd0debe62ccfef3df4fb52744

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