DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
authorXin Li <delphij@google.com>
Tue, 11 Dec 2018 22:05:28 +0000 (14:05 -0800)
committerXin Li <delphij@google.com>
Tue, 11 Dec 2018 22:05:28 +0000 (14:05 -0800)
Bug: 120502534
Change-Id: Ibae9975bacb16812d4ee4d0602e151e8683921f3

1  2 
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.0/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in

Simple merge