tree 9b9b0c8c23ccb7358275d06ec0375f7a2723cfdf
parent 5d98761ef9cb3ecd215ad119e2df3a7be0e43b8b
parent ff7ee3bd513c193f22302b9b8829b608cd2f1cf7
author Xin Li <delphij@google.com> 1629246236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246236 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1051a3edb9 -s ours am: bcd7412ae9 -s ours am: 019101e1c7 -s ours am: ff7ee3bd51 -s ours

am skip reason: Merged-In I73faf2fdc96ed47d3ab85855155ac7bd25925776 with SHA-1 02ef8fbfe5 is already in history

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

Change-Id: I191372807419cd85227d943aed5ac23d2a597440