summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-06-17 13:49:02 -0700
committerJeff Brown <jeffbrown@google.com>2010-06-17 13:49:02 -0700
commite899caf8cce1d1a20121f19a99899553ae2b327e (patch)
treefb67ed204c6d9567957875aad9c0934f42673f02
parent5c225b1680e696ae8bbf505a1997d6f720672f74 (diff)
downloadframeworks_base-e899caf8cce1d1a20121f19a99899553ae2b327e.zip
frameworks_base-e899caf8cce1d1a20121f19a99899553ae2b327e.tar.gz
frameworks_base-e899caf8cce1d1a20121f19a99899553ae2b327e.tar.bz2
Fixed api/current.xml after a bad merge.
Change-Id: I033f417e928eb541f0528521326b66776a3c9096
-rw-r--r--api/current.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml
index 6847352..38ba53a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -176769,7 +176769,7 @@
synchronized="false"
static="true"
final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
visibility="public"
>
<parameter name="downTime" type="long">
@@ -176804,7 +176804,7 @@
synchronized="false"
static="true"
final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
<parameter name="downTime" type="long">