diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 19:02:41 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 19:02:41 -0700 |
| commit | fae998c860e545e35fd3f4a821837409ee9bcb4e (patch) | |
| tree | 90e64e21243caefff0a2394841f4ad9b167f8cc3 /api | |
| parent | a20e87347605a625d557c4b9c721fb2e560573ee (diff) | |
| parent | 7c08b70c960a9a6d9e59e854b88c0877fe33dc99 (diff) | |
| download | frameworks_base-fae998c860e545e35fd3f4a821837409ee9bcb4e.zip frameworks_base-fae998c860e545e35fd3f4a821837409ee9bcb4e.tar.gz frameworks_base-fae998c860e545e35fd3f4a821837409ee9bcb4e.tar.bz2 | |
resolved conflicts for merge of 7c08b70c to master
Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.xml b/api/current.xml index 211ad95..f4eefae 100644 --- a/api/current.xml +++ b/api/current.xml @@ -28843,7 +28843,7 @@ </parameter> </method> <method name="remove" - return="void" + return="int" abstract="false" native="false" synchronized="false" @@ -28852,7 +28852,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="id" type="long"> +<parameter name="ids" type="long..."> </parameter> </method> <field name="ACTION_DOWNLOAD_COMPLETE" @@ -29256,7 +29256,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="id" type="long"> +<parameter name="ids" type="long..."> </parameter> </method> <method name="setFilterByStatus" |