tree 27d8378cdb568e851bc7790007133952fb31309a
parent b86f9b3053a78e919d4d53cdfb051b43cdfc0cc5
parent 839659d9fd4df3594ac2f0526bb0a9ea8bee256f
author Treehugger Robot <treehugger-gerrit@google.com> 1596564068 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596564068 +0000

[automerger skipped] Merge "Update client code for AudioEffect" am: db05c2d7a8 am: 839659d9fd -s ours

am skip reason: Change-Id I355fc9a174a87e682ad870d7c73c1403cdb156ab with SHA-1 b86f9b3053 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1386841

Change-Id: I904710a6751553d2c32bc16126d3f44bc2d2e714