commit 07b88ea0acd44ecd317ce37eb4338e5b0d2b52b0
author Steve Howard <showard@google.com> Thu Sep 30 14:59:15 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 30 14:59:15 2010 -0700
tree 17cf13f353fc12b33fa6fc70fe06941bf1a437ae
parent 8fc2518776cb3989a4898ba4b1475549a548b7fb
parent 83129bba368d6f50d3e0920b8574611a741bed56

Merge "Updated current.xml as autogenerated"

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index bd86412..403820d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -28771,17 +28771,6 @@
  visibility="public"
 >
 </field>
-<field name="COLUMN_REASON"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;reason&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="COLUMN_ID"
  type="java.lang.String"
  transient="false"
@@ -28826,6 +28815,17 @@
  visibility="public"
 >
 </field>
+<field name="COLUMN_REASON"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;reason&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="COLUMN_STATUS"
  type="java.lang.String"
  transient="false"
@@ -28980,6 +28980,50 @@
  visibility="public"
 >
 </field>
+<field name="PAUSED_QUEUED_FOR_WIFI"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="PAUSED_UNKNOWN"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="PAUSED_WAITING_FOR_NETWORK"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="PAUSED_WAITING_TO_RETRY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="STATUS_FAILED"
  type="int"
  transient="false"
@@ -29035,50 +29079,6 @@
  visibility="public"
 >
 </field>
-<field name="PAUSED_WAITING_TO_RETRY"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="PAUSED_WAITING_FOR_NETWORK"
- type="int"
- transient="false"
- volatile="false"
- value="2"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="PAUSED_QUEUED_FOR_WIFI"
- type="int"
- transient="false"
- volatile="false"
- value="3"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="PAUSED_UNKNOWN"
- type="int"
- transient="false"
- volatile="false"
- value="4"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="DownloadManager.Query"
  extends="java.lang.Object"
@@ -241716,7 +241716,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>