am 6938bb36: Fixing the broken build
Merge commit '6938bb36b8992420ec5cb392706a8bc192b332c1' into eclair-plus-aosp
* commit '6938bb36b8992420ec5cb392706a8bc192b332c1':
Fixing the broken build
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index dcea882..ed2a78e 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -244,6 +244,7 @@
* This column is only returned if explicitly requested in the query
* projection.
* <p>Type: TEXT</p>
+ * @hide TODO unhide
*/
public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP =
Presence.PRESENCE_CUSTOM_STATUS_TIMESTAMP;
@@ -253,6 +254,7 @@
* This column is only returned if explicitly requested in the query
* projection.
* <p>Type: NUMBER</p>
+ * @hide TODO unhide
*/
public static final String PRESENCE_PROTOCOL = "presence_protocol";
@@ -261,6 +263,7 @@
* {@link CommonDataKinds.Im#CUSTOM_PROTOCOL}. This column is only
* returned if explicitly requested in the query projection.
* <p>Type: TEXT</p>
+ * @hide TODO unhide
*/
public static final String PRESENCE_CUSTOM_PROTOCOL = "presence_custom_protocol";
@@ -969,6 +972,7 @@
/**
* The time when the presence custom status was inserted/updated.
* <p>Type: TEXT</p>
+ * @hide TODO unhide
*/
public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP = "status_timestamp";
}