tree ba90da3bc46eaa9ab4d0a11bbd095539d98b9670
parent 973d39353d237f3cb8b2b4d89ac787dd465a7f32
parent bbc53d8e8d7ab6ffb8b725e3039d1f8b5ef8c387
author Xin Li <delphij@google.com> 1693271432 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693271432 +0000

[automerger skipped] Merge Android U (ab/10368041) am: dc95f65288 -s ours am: a29170240f -s ours am: bbc53d8e8d -s ours

am skip reason: Merged-In Ibfae74a433ceb2e27900328161d3625b77e1765c with SHA-1 61e0951e67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/24182863

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