tree b6996949fa06cd751913185fd4020355127d38c2
parent cf3abc49c9dbd797c07dbdfe78a052b91fb02209
parent f35dae6311726fc242c3e16672cc0adb0c9eb2c5
author Xin Li <delphij@google.com> 1693271429 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693271429 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 4d52a58120 -s ours am: 1e7b3919d1 -s ours am: f35dae6311 -s ours

am skip reason: Merged-In I0b5ddd4cd207c63185f38a57806b9bae38e82e4d with SHA-1 849c7b054e is already in history

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

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