diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-12-03 10:50:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 10:50:10 -0800 |
| commit | 37416c44c09600750a907f84c90d3f8d762c0fdf (patch) | |
| tree | c576a654f0b8b390c2c1ada09d1e4c7f53cd8a2b | |
| parent | 55481bb77d195d91f42e6ce5f7d05d9e1beb0691 (diff) | |
| parent | 772e90a42745e4958e25c7dd7122d3f6be4998c7 (diff) | |
| download | frameworks_base-37416c44c09600750a907f84c90d3f8d762c0fdf.zip frameworks_base-37416c44c09600750a907f84c90d3f8d762c0fdf.tar.gz frameworks_base-37416c44c09600750a907f84c90d3f8d762c0fdf.tar.bz2 | |
am 772e90a4: am 780211a9: Fixing broken build
Merge commit '772e90a42745e4958e25c7dd7122d3f6be4998c7'
* commit '772e90a42745e4958e25c7dd7122d3f6be4998c7':
Fixing broken build
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 8b6de2e..30c73d7 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -431,7 +431,7 @@ public final class ContactsContract { * </tr> * <tr> * <td>long</td> - * <td>{@link #NAME_RAW_CONTACT_ID}</td> + * <td>NAME_RAW_CONTACT_ID</td> * <td>read-only</td> * <td>The ID of the raw contact that contributes the display name * to the aggregate contact. During aggregation one of the constituent @@ -443,7 +443,7 @@ public final class ContactsContract { * <td>{@link #DISPLAY_NAME}</td> * <td>read-only</td> * <td>The display name for the contact. It is the display name - * contributed by the raw contact referred to by the {@link #NAME_RAW_CONTACT_ID} + * contributed by the raw contact referred to by the NAME_RAW_CONTACT_ID * column.</td> * </tr> * <tr> |