commit 8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23
author Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 12:56:30 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 12:56:30 2009 -0800
tree 8c4dbfd8b83bf1c694cfdbd2152d7b3260262120
parent 930ab3d955a40c1de167b7142215af37f9f9bfe4
parent 85adf5e56235bcea2f8991d983b94f4199e28faa

Merge change I85adf5e5 into eclair-mr2

* changes:
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.

core/java/android/provider/ContactsContract.java

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 80d5d08..117de15 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -1331,7 +1331,7 @@
          * <p>
          * A sub-directory of a single raw contact that contains all of their
          * {@link ContactsContract.Data} rows. To access this directory append
-         * {@link Entity#CONTENT_DIRECTORY} to the contact URI. See
+         * {@link #CONTENT_DIRECTORY} to the contact URI. See
          * {@link RawContactsEntity} for a stand-alone table containing the same
          * data.
          * </p>