tree 7b2ec52c19e87bcf9eba5112413cb0a58f69e3be
parent f01c28bed499a14953400c8f019b7fdb74d79801
parent 02ef8fbfe583be9001159ba91e96644ee60dd2d5
author Xin Li <delphij@google.com> 1624292075 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624292075 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ibe82bf318d8b9929d903a0d674714d4b3c28db71