tree 5acc24910d727648e03766e27d294004fb3c523e
parent 5d3fd12e1b8a140011f6259d2f2cbfc55b47f79f
parent 6bb6cbf257d88ea376715b72ba1940dc0ea352fd
author Hall Liu <hallliu@google.com> 1603403449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603403449 +0000

Update the call forwarding/waiting APIs am: a1acea2cbd am: 6bb6cbf257

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1470911

Change-Id: Ib8a8cbe2275fd2ca7d5464247e361b2cc98b2819