diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-11-01 16:09:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-01 16:09:44 -0700 |
| commit | ab1b304bd4cf0bb6473b21d5604596105b794362 (patch) | |
| tree | 9822078d7454b320f26f8c7431ba26b9ff2a0d20 | |
| parent | e06bdead5decc26c7fd7ed9b10ad0f009e14d274 (diff) | |
| parent | ccb75a882f670f8928f13a485c0c29b8b8b93af3 (diff) | |
| download | frameworks_base-ab1b304bd4cf0bb6473b21d5604596105b794362.zip frameworks_base-ab1b304bd4cf0bb6473b21d5604596105b794362.tar.gz frameworks_base-ab1b304bd4cf0bb6473b21d5604596105b794362.tar.bz2 | |
am ccb75a88: Merge "Update the API file." into gingerbread
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
Update the API file.
| -rw-r--r-- | api/current.xml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/api/current.xml b/api/current.xml index d0404c4..417281f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -226669,7 +226669,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> @@ -328742,7 +328742,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="toCopyIn" type="E[]"> +<parameter name="array" type="E[]"> </parameter> </constructor> <method name="add" @@ -328770,7 +328770,7 @@ > <parameter name="index" type="int"> </parameter> -<parameter name="element" type="E"> +<parameter name="e" type="E"> </parameter> </method> <method name="addAll" @@ -328898,7 +328898,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="o" type="java.lang.Object"> +<parameter name="e" type="E"> +</parameter> +<parameter name="index" type="int"> </parameter> </method> <method name="indexOf" @@ -328911,9 +328913,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="e" type="E"> -</parameter> -<parameter name="index" type="int"> +<parameter name="o" type="java.lang.Object"> </parameter> </method> <method name="isEmpty" @@ -328948,7 +328948,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="o" type="java.lang.Object"> +<parameter name="e" type="E"> +</parameter> +<parameter name="index" type="int"> </parameter> </method> <method name="lastIndexOf" @@ -328961,9 +328963,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="e" type="E"> -</parameter> -<parameter name="index" type="int"> +<parameter name="o" type="java.lang.Object"> </parameter> </method> <method name="listIterator" @@ -329054,7 +329054,7 @@ > <parameter name="index" type="int"> </parameter> -<parameter name="element" type="E"> +<parameter name="e" type="E"> </parameter> </method> <method name="size" |