tree c2afa35bd2da06539e6af4629b6060cb424da10e
parent 403d88c5ae48b863fb0f246c21e4c828ee3c4977
parent b35574fe8031c2f7b1c20dfac9b1d1abba9cfdde
author Xin Li <delphij@google.com> 1696638260 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638260 +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: b35574fe80 -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: I6a8e6d10ed1356e9bf552a1809baff5e01d2d8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>