tree 9c30a735dcf582b3da4cd815d7373da1e28b3769
parent f251c7da6adfebc2a2d7eeaf95ccf735269a0621
parent cf5fa4be494b1c88d241fc0b5da60fce7667a212
author Xin Li <delphij@google.com> 1633679808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679808 +0000

[automerger skipped] Merge "Merge Android 12" am: d2d37213cd -s ours am: 69902c2b9a -s ours am: cf5fa4be49 -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: Ieebce417f428687431fe976e2c0be5bd4e54e456