tree 7b2ec52c19e87bcf9eba5112413cb0a58f69e3be
parent e505cee95d678670a15b7c5790abbc9b7918205f
parent 217998da1d14a29d4863462d7e36ab3950021a4f
author Xin Li <delphij@google.com> 1624257766 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624257766 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 87f5e5c4fc -s ours am: 217998da1d -s ours

am skip reason: Merged-In I5ac23f4face323c3a42d166f3117408b2955c170 with SHA-1 2aa79446ed is already in history

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

Change-Id: I73faf2fdc96ed47d3ab85855155ac7bd25925776