Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:34:46 +0000 (12:34 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:34:46 +0000 (12:34 -0800)
Change-Id: I3db5264ca20d64d152a9407fcdd1ac7f7c47b45c

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