commit 093ce5fec31af6d5827e1a8e093aa6b20354bf38
author Yorke Lee <yorkelee@google.com> Thu Aug 06 01:42:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 01:42:59 2015 +0000
tree 7d85798472ae0f01f9e0cb6d1a850d9090f67068
parent 7fa6de08fd51769742897059ae3183760c832362
parent 8751e6891a4ef87782c7f63db9f1cf8b7cb28cb2

am 8751e689: Merge "Correctly hide setConnectionService" into mnc-dev

* commit '8751e6891a4ef87782c7f63db9f1cf8b7cb28cb2':
  Correctly hide setConnectionService

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();