[automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours am: 8de78e5f89 -s ours

am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

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

Change-Id: I56319728d3efbd295657a01c888c30e76b651db0
This commit is contained in:
Xin Li 2021-10-08 07:56:20 +00:00 committed by Automerger Merge Worker
commit 8e87d76f07

Diff content is not available