commit 03a2aea2a2ddce96cb72e57e389b86fc03cbcb5b
author The Android Automerger <android-build@google.com> Thu Aug 06 01:05:24 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Aug 06 01:05:24 2015 -0700
tree 7d85798472ae0f01f9e0cb6d1a850d9090f67068
parent 093ce5fec31af6d5827e1a8e093aa6b20354bf38
parent 61d803cdac361ab468d49b10cca93d40b67c258b

merge in mnc-dr-release history after reset to mnc-dr-dev

system-api/23.txt

diff --git a/system-api/23.txt b/system-api/23.txt
index 4855f91..ac5fd90 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -29821,7 +29821,6 @@
     method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
     method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);
     method public final void setConnectionCapabilities(int);
-    method public final void setConnectionService(android.telecom.ConnectionService);
     method public final void setDialing();
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setInitialized();