[automerger skipped] Merge "Merge Android 14" into main am: f900001fa7
-s ours am: b500f4f589
-s ours am: 83a2341ae0
-s ours am: 7544efe6ac
-s ours am: 006052478b
-s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346
Change-Id: Ibece36fb7a5fd8b28c8f4b936a21fefd5dffd91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
ea2647f566