From: Tyler Gunn <tgunn@google.com>
Date: Fri, 1 Feb 2019 20:31:53 +0000 (-0800)
Subject: Merge "Deprecate acceptRingingCall and endCall." am: 6e3a88a3e2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=994c17768a401b47558900a0ff06b522f6e566b9;p=android-x86%2Fframeworks-base.git

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

Change-Id: Ie2bc60b8c8f5abc1651944fa3f927b23ab545d0f
---

994c17768a401b47558900a0ff06b522f6e566b9