summaryrefslogtreecommitdiffstats
path: root/api/current.xml
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2009-10-08 19:18:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-08 19:18:48 -0700
commit6195432b6fde3cda4bc7e2406c8f2975795933a7 (patch)
tree0fa2c9ef413db4de4d7acd9d1f83d79648aa5e83 /api/current.xml
parent68f857cd442c2e9b91ffb5111a5fbae7ac72edc8 (diff)
parentde6a2bc0534e6f966cb80bf8d337df8a47dd5aae (diff)
downloadframeworks_base-6195432b6fde3cda4bc7e2406c8f2975795933a7.zip
frameworks_base-6195432b6fde3cda4bc7e2406c8f2975795933a7.tar.gz
frameworks_base-6195432b6fde3cda4bc7e2406c8f2975795933a7.tar.bz2
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
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 b269c82..e4c3f85 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -17299,6 +17299,17 @@
visibility="public"
>
</method>
+<method name="getMemoryClass"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getMemoryInfo"
return="void"
abstract="false"