tree 5dfda0d170f7dd6c5085f475dcd5f3319258cd3b
parent 58e8a5e6e0045e91c667572a211c9673d659bd86
parent 407eb0ebf3ce52fd4b3d79712d1b86d7b021c29b
author Jason Macnak <natsu@google.com> 1646166988 -0800
committer Jason Macnak <natsu@google.com> 1646167258 -0800

Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'

... to pull in support for `gralloc->set(<metadata>)` for Cuttlefish
from https://crrev.com/c/3421048 and the related changes in the chain.

Bug: b/219757060
Test: cvd start
Test: cts dEQP-VK.api.external.memory.android_hardware_buffer.*
Test: vts -m VtsHalGraphicsMapperV4_0Target

Test: cvd start --gpu_mode=gfxstream
Test: cts dEQP-VK.api.external.memory.android_hardware_buffer.*
Test: vts -m VtsHalGraphicsMapperV4_0Target
Change-Id: I541d479da3b208c25666fcc50f89c790c361f1f6