tree c2afa35bd2da06539e6af4629b6060cb424da10e
parent c327ceb3c0700a148d265c29995b46f40f085a27
parent 63ed19f892efac8eb0b7b8512371d737985367db
author Xin Li <delphij@google.com> 1696590289 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696590289 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 6e5271930f -s ours am: e4249e6acb -s ours am: bd26a55c29 -s ours am: 63ed19f892 -s ours

am skip reason: Merged-In I086eec8d1726b9f0c42a7b1a26dfcc93f394106e with SHA-1 40fa6e18cd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2775005

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