summaryrefslogtreecommitdiffstats
path: root/api/current.xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-10-29 01:20:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 01:20:01 -0700
commit40946aa20183984fd60f2dbdc7708cf1c5431047 (patch)
tree61412a0c6f2f7f4598956d9b264c80b4368f0785 /api/current.xml
parentf5633bc7e2fddbd1104d129b9d55d74fa8c2666b (diff)
parent1f668fff8ad2b8d79d42da5d9667d308fa0b9441 (diff)
downloadframeworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.zip
frameworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.tar.gz
frameworks_base-40946aa20183984fd60f2dbdc7708cf1c5431047.tar.bz2
am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2 * commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441': Add SDK version for MR1.
Diffstat (limited to 'api/current.xml')
-rw-r--r--api/current.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 4cd9718..6ba1199 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -99410,6 +99410,17 @@
visibility="public"
>
</field>
+<field name="ECLAIR_MR1"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
</class>
<class name="Bundle"
extends="java.lang.Object"