commit 711d876fd110b33519afb5d05f5a740ade635787
author Tyler Gunn <tgunn@google.com> Fri Sep 19 11:17:02 2014 -0700
committer Tyler Gunn <tgunn@google.com> Tue Sep 23 10:00:38 2014 -0700
tree c56d30925969aeaeb73326ea98a1f980e3ac518a
parent 55fa0207134d7a2470f060445938b2d63e180f4e

@hide ConnectionService APIs.

Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f

telecomm/java/android/telecom/Conference.java

diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 9b350c1..e47d9d1 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -16,6 +16,8 @@
 
 package android.telecom;
 
+import android.annotation.SystemApi;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -24,7 +26,9 @@
 
 /**
  * Represents a conference call which can contain any number of {@link Connection} objects.
+ * @hide
  */
+@SystemApi
 public abstract class Conference {
 
     /** @hide */