Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6938bb36: Fixing the broken build

Browse Source 
Merge commit '6938bb36b8992420ec5cb392706a8bc192b332c1' into eclair-plus-aosp

* commit '6938bb36b8992420ec5cb392706a8bc192b332c1':
  Fixing the broken build
This commit is contained in:
Dmitri Plotnikov
2009-09-24 14:11:55 -07:00
committed by Android Git Automerger
parent f28ffd0688 6938bb36b8
commit 7f8d14e832
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/ContactsContract.java
View File

@@ -244,6 +244,7 @@ public final class ContactsContract {
* 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 @@ public final class ContactsContract {
* 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 @@ public final class ContactsContract {
* {@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 @@ public final class ContactsContract {
/**
* 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";
}