diff options
| author | kmccormick <kmccormick@google.com> | 2013-03-28 16:47:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-28 16:47:25 -0700 |
| commit | eff1151d6c66bb7ab4fcf1a2ce0f92c2770ae886 (patch) | |
| tree | b472fc444be9ae9d4ad12de4f53754aadbca20cf | |
| parent | 5399a5648fb6756a7e7429b07a5a36493ff00395 (diff) | |
| parent | 0de7af1e18a72a979baa9711e4e980b21cf80255 (diff) | |
| download | frameworks_base-eff1151d6c66bb7ab4fcf1a2ce0f92c2770ae886.zip frameworks_base-eff1151d6c66bb7ab4fcf1a2ce0f92c2770ae886.tar.gz frameworks_base-eff1151d6c66bb7ab4fcf1a2ce0f92c2770ae886.tar.bz2 | |
am 0de7af1e: am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '0de7af1e18a72a979baa9711e4e980b21cf80255':
Doc update: misc fixes
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 4 | ||||
| -rw-r--r-- | core/java/android/util/AttributeSet.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 90bcf1c..66083c8 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1359,7 +1359,7 @@ public final class ContactsContract { * status definitions. Automatically computed as the highest presence of all * constituent raw contacts. The provider may choose not to store this value * in persistent storage. The expectation is that presence status will be - * updated on a regular basic.</td> + * updated on a regular basis.</td> * </tr> * <tr> * <td>String</td> @@ -4181,7 +4181,7 @@ public final class ContactsContract { * all IM rows. See {@link StatusUpdates} for individual status definitions. * The provider may choose not to store this value * in persistent storage. The expectation is that presence status will be - * updated on a regular basic. + * updated on a regular basis. * </td> * </tr> * <tr> diff --git a/core/java/android/util/AttributeSet.java b/core/java/android/util/AttributeSet.java index 470526c..74942ba 100644 --- a/core/java/android/util/AttributeSet.java +++ b/core/java/android/util/AttributeSet.java @@ -151,7 +151,7 @@ public interface AttributeSet { * Return the value of 'attribute' as a resource identifier. * * <p>Note that this is different than {@link #getAttributeNameResource} - * in that it returns a the value contained in this attribute as a + * in that it returns the value contained in this attribute as a * resource identifier (i.e., a value originally of the form * "@package:type/resource"); the other method returns a resource * identifier that identifies the name of the attribute. @@ -230,7 +230,7 @@ public interface AttributeSet { * Return the value of attribute at 'index' as a resource identifier. * * <p>Note that this is different than {@link #getAttributeNameResource} - * in that it returns a the value contained in this attribute as a + * in that it returns the value contained in this attribute as a * resource identifier (i.e., a value originally of the form * "@package:type/resource"); the other method returns a resource * identifier that identifies the name of the attribute. |