tree 9b9b0c8c23ccb7358275d06ec0375f7a2723cfdf
parent cb79c60a6871d2e358944527c574bcf8b1b162f0
parent 2e3ea1c73834264e870ca2782b16faa073715048
author Xin Li <delphij@google.com> 1633683596 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683596 +0000

[automerger skipped] Merge "Merge Android 12" am: d2d37213cd -s ours am: 69902c2b9a -s ours am: cf5fa4be49 -s ours am: ee7b5630f7 -s ours am: 2e3ea1c738 -s ours

am skip reason: Merged-In I1f60cd434a6cda1c1039dd05f3690d9dcc65f7e2 with SHA-1 ea1b825f58 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/audio/+/1847607

Change-Id: Ic8df654297a060a799aae5fceb89802d33d01545