Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89ef9628 authored by kmccormick's avatar kmccormick Committed by Android Git Automerger
Browse files

am eff1151d: am 0de7af1e: am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367:... 

am eff1151d: am 0de7af1e: am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs

* commit 'eff1151d':
  Doc update: misc fixes
parents 2c3dcfcd eff1151d

core/java/android/provider/ContactsContract.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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>
@@ -4181,7 +4181,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>

core/java/android/util/AttributeSet.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.