diff options
| author | 2013-03-28 23:36:44 +0000 | |
|---|---|---|
| committer | 2013-03-28 23:36:45 +0000 | |
| commit | 378d43677b45ec8dc629bc18f360d35f13c9ffec (patch) | |
| tree | 8c8f8faca0da47d85cd5ccff00831948fb14b861 | |
| parent | 4f414b7949a969c1e1cb0597155bca1d3aa2c455 (diff) | |
| parent | 50e27c813522e1772e3bd406c5e0d6d7dee14cc0 (diff) | |
Merge "Doc update: misc fixes" into jb-mr1.1-docs
| -rwxr-xr-x | 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 8f54a38523ed..965d38d8ce57 100755 --- 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> @@ -4131,7 +4131,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 470526cf1bdd..74942baa3951 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. |