drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs

Browse Source 
* commit '378d43677b45ec8dc629bc18f360d35f13c9ffec':
  Doc update: misc fixes
This commit is contained in:
kmccormick
2013-03-28 16:39:53 -07:00
committed by Android Git Automerger
parent 4d0beb7e54 378d43677b
commit 593c0dbf25
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/ContactsContract.java
View File

@ -1359,7 +1359,7 @@ public final class ContactsContract {
* status definitions. Automatically computed as the highest presence of all * status definitions. Automatically computed as the highest presence of all
* constituent raw contacts. The provider may choose not to store this value * constituent raw contacts. The provider may choose not to store this value
* in persistent storage. The expectation is that presence status will be * 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>
* <tr> * <tr>
* <td>String</td> * <td>String</td>
@ -4131,7 +4131,7 @@ public final class ContactsContract {
* all IM rows. See {@link StatusUpdates} for individual status definitions. * all IM rows. See {@link StatusUpdates} for individual status definitions.
* The provider may choose not to store this value * The provider may choose not to store this value
* in persistent storage. The expectation is that presence status will be * in persistent storage. The expectation is that presence status will be
* updated on a regular basic. * updated on a regular basis.
* </td> * </td>
* </tr> * </tr>
* <tr> * <tr>

4
core/java/android/util/AttributeSet.java
View File

@ -151,7 +151,7 @@ public interface AttributeSet {
* Return the value of 'attribute' as a resource identifier. * Return the value of 'attribute' as a resource identifier.
* *
* <p>Note that this is different than {@link #getAttributeNameResource} * <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 * resource identifier (i.e., a value originally of the form
* "@package:type/resource"); the other method returns a resource * "@package:type/resource"); the other method returns a resource
* identifier that identifies the name of the attribute. * 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. * Return the value of attribute at 'index' as a resource identifier.
* *
* <p>Note that this is different than {@link #getAttributeNameResource} * <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 * resource identifier (i.e., a value originally of the form
* "@package:type/resource"); the other method returns a resource * "@package:type/resource"); the other method returns a resource
* identifier that identifies the name of the attribute. * identifier that identifies the name of the attribute.