tree b4d1e02a69288884ee7dd6702cf9d69ea7a04ef0
parent f8e84f843466ba27fc3c62ba45982d1ba9b2db61
parent 6e3a88a3e2d72a758de6b6f719b3d15c464950f5
author Tyler Gunn <tgunn@google.com> 1549049773 -0800
committer android-build-merger <android-build-merger@google.com> 1549049773 -0800

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

Change-Id: I12830995d5a6f14d5aabd30cc084e36b4d4b740c