tree 993a42a5b3300fb342f56f7ebff0f92faad0ff28
parent ab9b774cd69e911be6520c7921d13f15e7f8fbec
parent 280019629c042047774fad9480d9891e58e38597
author Tyler Gunn <tgunn@google.com> 1549053113 -0800
committer android-build-merger <android-build-merger@google.com> 1549053113 -0800

Merge "Deprecate acceptRingingCall and endCall." am: 6e3a88a3e2
am: 280019629c

Change-Id: Ie2bc60b8c8f5abc1651944fa3f927b23ab545d0f