Merge remote-tracking branch 'aosp/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Fri, 9 Nov 2018 18:16:07 +0000 (10:16 -0800)
committerChris Forbes <chrisforbes@google.com>
Fri, 9 Nov 2018 18:16:07 +0000 (10:16 -0800)
commit66aaa24f0c2bc22b6b644ca309b3863179b9803d
tree9bc20106bfbdc9bfcc94ea2020ea905c1c19af68
parent2c6a19cece297f430c93849dc3a8caad8e568b26
parent91b08dd28900bd675c08c0f3bef1b9ab8841c2f2
Merge remote-tracking branch 'aosp/master' into HEAD

Change-Id: I0a5e228d7357f3041ab4b1d22937171943922196
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp