summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-01 16:57:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-01 16:57:58 -0700
commitd79de7bc360a81feb12f8d0c9bb6c4aff92f9de1 (patch)
treeb5fb3d819d7d1232e3d63642eb602de92dd872b0
parent59f6b0da29034747bb66466739cb565047c912b8 (diff)
parent4fd76ba2270da1df12ae11f6d3d3ed564e38464b (diff)
downloadframeworks_base-d79de7bc360a81feb12f8d0c9bb6c4aff92f9de1.zip
frameworks_base-d79de7bc360a81feb12f8d0c9bb6c4aff92f9de1.tar.gz
frameworks_base-d79de7bc360a81feb12f8d0c9bb6c4aff92f9de1.tar.bz2
am 4fd76ba2: am 81f339bc: Merge "Fixing the build." into gingerbread
Merge commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b' * commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b': Fixing the build.
-rw-r--r--api/current.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml
index 0307bff..e2e1346 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -213724,7 +213724,7 @@
synchronized="true"
static="false"
final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
visibility="public"
>
</method>
@@ -214274,7 +214274,7 @@
synchronized="true"
static="false"
final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
visibility="public"
>
<parameter name="pluginsPath" type="java.lang.String">