tree 27d8378cdb568e851bc7790007133952fb31309a
parent a36b1686d9b8f6c2b52febfba12cc2b993d8de47
parent 90caf11575f02672864a881e0b5d19c1d9ccc4c7
author Treehugger Robot <treehugger-gerrit@google.com> 1596566223 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596566223 +0000

[automerger skipped] Merge "Update client code for AudioEffect" am: db05c2d7a8 am: 839659d9fd -s ours am: 303e023179 -s ours am: 90caf11575 -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: I37d60492b9b2daf167f5da6ef4643b7d517cadfe