tree 27d8378cdb568e851bc7790007133952fb31309a
parent d4aeaf1349672e30a7b2b2c5ac096912d17ab8bc
parent 38e547c714a515d76665be73060fba53df7da218
author Xin Li <delphij@google.com> 1606274378 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606274378 +0000

Mark ab/6881855 as merged am: f3d4238499 am: 38e547c714

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

Change-Id: I28f2504df462369ca28474901ae61e768e643a9c