diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-08-05 22:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 22:13:07 +0000 |
| commit | f0affc6d46849e844bec9ddc755ffae0042e443f (patch) | |
| tree | 8ce9659e869ad2aaaf28d39fb37f67d766ed5ea3 /telecomm/java/android/telecom | |
| parent | 2c1a22d91607e18c7618e79ab026d3c5c4ce8949 (diff) | |
| parent | 5346396ba2077a8bd03da1adde46db6b39669ac9 (diff) | |
| download | frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.zip frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.tar.gz frameworks_base-f0affc6d46849e844bec9ddc755ffae0042e443f.tar.bz2 | |
Merge "Correctly hide setConnectionService" into mnc-dev
Diffstat (limited to 'telecomm/java/android/telecom')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index d663952..7b277c5 100644 --- 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) { |