Merge changes I3e77c422,Ic6712c73 into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 28 Mar 2018 00:26:16 +0000 (00:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Mar 2018 00:26:16 +0000 (00:26 +0000)
commitdd5d8a037f4b07c754f8384a851ffd330d74f360
treef2083a3c56a4d8e01d9640d696a7b0fb9dc75909
parentfda2c834a5080fcac4473f1960bb0226a532d890
parent80eca21ecaa4dace07218dcd274d54ea712ae7bc
Merge changes I3e77c422,Ic6712c73 into pi-dev

* changes:
  Whitelist VK_ANDROID_external_memory_android_hardware_buffer
  Temporarily exclude dEQP-VK.memory.mapping.dedicated_alloc.image.full.*
android/cts/master/vk-master.txt