Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395...
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 19:50:11 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 19:50:11 +0000 (19:50 +0000)
am: 9b38704f93

Change-Id: Ibd1cf9eb7a4d1b848db67eff39b49ccb1f0eac33

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