am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f': Correctly hide setConnectionService
2015-08-06 01:43:05 +00:00
parent c34288be58 f0affc6d46
commit cac65febb7
3 changed files with 1 additions and 3 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1588,7 +1588,7 @@ public abstract class Connection extends Conferenceable {
        return mUnmodifiableConferenceables;
    }

-    /*
+    /**
     * @hide
     */
    public final void setConnectionService(ConnectionService connectionService) {