[automerger skipped] Merge "Merge Android 12" am: 77d993075f
-s ours am: d3e53d6ea0
-s ours am: 8de78e5f89
-s ours am: 8e87d76f07
-s ours am: 7d63602f2d
-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: I544b2f427991582ebc62b19bf43a9456578a2757
This commit is contained in:
commit
6703053478