tree 6fb0aacdcfafa1c20846ecae7178bd23f7b2be9b
parent 02a2c38c0919cc64f1da717f5bc188dbcdc7f9e5
parent 77429c426b50a6513f62ef7e436dc60ac40c4cd9
author Xin Li <delphij@google.com> 1693341458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693341458 +0000

[automerger skipped] Merge Android U (ab/10368041) am: dc95f65288 -s ours am: a29170240f -s ours am: bbc53d8e8d -s ours am: 77429c426b -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: I92ffd1f9ee25d922bf0e6eb64709e116eb122459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>