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)
commit79f9356d506daf7bf9ecc8a2535fef85fb8347d3
treeef544aab348c2b15c5d1be5804b1ed8d83f5ebef
parent655a26d34819414ef3da360b07dddcb380cbe0aa
parent9b38704f93afbc6f01b18d60157fab226133be5b
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395 am: 65d27d1ecb
am: 9b38704f93

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