am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.

Merge commit '29f28cfe2188179519094e35d7fad09588170e88'

* commit '29f28cfe2188179519094e35d7fad09588170e88':
  Fixed api/current.xml after a bad merge.
This commit is contained in:
Jeff Brown
2010-06-17 13:57:05 -07:00
committed by Android Git Automerger

View File

@@ -180121,7 +180121,7 @@
synchronized="false"
static="true"
final="false"
deprecated="deprecated"
deprecated="not deprecated"
visibility="public"
>
<parameter name="downTime" type="long">
@@ -180156,7 +180156,7 @@
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
<parameter name="downTime" type="long">