tree acbc5c6aa04030acde873127bd06b53860e291d0
parent a1111920919b1c447e52242d901cdb9fccd6cc96
parent c2b7fb4aadb0298c289cddcac328534d16a27f4b
author Xin Li <delphij@google.com> 1646734904 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734904 +0000

[automerger skipped] Merge "Merge Android 12L" am: c2b7fb4aad -s ours

am skip reason: Merged-In Ice502eaba6c5dd8ca1157d3fde1b5b5b223267e4 with SHA-1 466b596cc5 is already in history

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

Change-Id: I6bb2fd8bd268fd95b7513288ceb74758335dd242