[automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -s ours am: ac127a77a1 -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: I1b040732963cbba14513ff8c6e86e0be60019852
This commit is contained in:
Xin Li 2022-03-09 11:36:23 +00:00 committed by Automerger Merge Worker
commit a66c63c864

Diff content is not available