summaryrefslogtreecommitdiffstats
path: root/api/current.xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-10-29 02:02:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 02:02:08 -0700
commitf267b947657a3c057d15650a39b98e7b2129bc70 (patch)
tree67939c2decb55d5515001cbd6cef13a056438733 /api/current.xml
parent8a6219660d3d0b88423bdb9239852ca95e24f57d (diff)
parent9a27909e754b8b2623bbc82a931c2930c033cbb1 (diff)
downloadframeworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.zip
frameworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.tar.gz
frameworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.tar.bz2
am 9a27909e: am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '9a27909e754b8b2623bbc82a931c2930c033cbb1' * commit '9a27909e754b8b2623bbc82a931c2930c033cbb1': 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 8a6cfa1..4412df5 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"