tree a57c969f266f5ba1e53589388d5ee19c55b26f7f
parent d03640798feffcfdd0b7c21c1efa95798bb1e436
parent 21ce9b3e4d7cb84a4998dee273977f78f3a11fd3
author Xin Li <delphij@google.com> 1599789766 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789766 +0000

[automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9b3e4d -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: Ibe69c92d13ba33c2f1e91aa3d7f4bfdb5cd609e6