summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-07-19 15:26:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-19 15:26:39 -0700
commita5fe776a7933b2241858ef83f01b812c7badc231 (patch)
treeb7ca3eedfa9d63961d19d4d7a700092a02056a49 /core
parent945ac54da56f79c8407c0111d6ded25afcc159fc (diff)
parent345f39a8a35d2df6274441c0e75e24efd375fb55 (diff)
downloadframeworks_base-a5fe776a7933b2241858ef83f01b812c7badc231.zip
frameworks_base-a5fe776a7933b2241858ef83f01b812c7badc231.tar.gz
frameworks_base-a5fe776a7933b2241858ef83f01b812c7badc231.tar.bz2
Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/ContactsContract.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 8bd5a10..f0ee838 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -409,7 +409,7 @@ public final class ContactsContract {
public static final String CONTACT_PRESENCE = "contact_presence";
/**
- * Contact Chat Capabilities. See {@link StatusColumns#CHAT_CAPABILITY} for individual
+ * Contact Chat Capabilities. See {@link StatusUpdates} for individual
* definitions.
* <p>Type: NUMBER</p>
*/