Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 13 Aug 2018 20:15:16 +0000 (13:15 -0700)
committerChris Forbes <chrisforbes@google.com>
Mon, 13 Aug 2018 20:15:16 +0000 (13:15 -0700)
commitd6c04dcc2eb9e1f3e51acd17fad36e35c19a583d
treecc0d2211751fcc3e8c6a935cfe0ec3edee17ebb6
parentac5467545ea7723cbd2aa2e2dccf94d220790157
parent7a78102df1f85c64b67bdfa008f7236c536cde67
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: I22f18ebbb60ec1cb841e6084433c406154690f1d
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
android/cts/master/src/gles3-test-issues.txt
android/cts/master/src/vk-excluded-tests.txt
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkDefs.hpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp