tree 8b82a26b50c460d60053aa0d6656e3c7291caac9
parent cdc9b257091a80502197040d73af08bd85850b31
parent 7016d2ba15d678e9099771f1da4a6c66cb163918
author Xin Li <delphij@google.com> 1599796748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796748 +0000

[automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9b3e4d -s ours am: fa93ef48d9 -s ours am: 7016d2ba15 -s ours

am skip reason: Change-Id Iab7fdea5e3abd2047d55e1a2c57ea700551ee03c with SHA-1 27203f54ed is in history

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

Change-Id: Ib4a4b23af1e83f506b53fe403dae2210c0c72fe1