tree 12468a21db2792304de68e2f8e9d21c64d4a198e
parent 7b8a26ed664bfd1d378571b75133be736ee35dac
parent 39c1270fad401cdbc8355564790ef480a7de759b
author Tim Van Patten <timvp@google.com> 1730318397 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1730318397 +0000

Merge remote-tracking branch 'aosp/upstream-main' into uprev am: 39c1270fad

Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/3325061

Change-Id: I1b2a5c1575a1608ff45e9dfc2dc8e7ab2060602b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>