[automerger skipped] Merge Android 12L am: d36a4710b1
-s ours am: ce05f25ef5
-s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694
Change-Id: Id2e36773bf86976aa38c0a297ef31a8b4c8ff8e5
This commit is contained in:
commit
46143e52bc