am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread

Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
This commit is contained in:
Vasu Nori
2010-07-19 15:29:10 -07:00
committed by Android Git Automerger

View File

@@ -409,7 +409,7 @@ public final class ContactsContract {
public static final String CONTACT_PRESENCE = "contact_presence"; 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. * definitions.
* <p>Type: NUMBER</p> * <p>Type: NUMBER</p>
*/ */