summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-07-09 17:51:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-09 17:51:34 -0700
commit0b18c14931c4ca618c67b5ac5c8351246879e90a (patch)
tree31e43d650724a4437860215f6b8f83ef7ae5e5f4 /api
parente16a21c6b4f108813e5f5e00f30e0ff075de504c (diff)
parent0f50cb31980c8354a4516094863c4ad0cdd0d03b (diff)
downloadframeworks_base-0b18c14931c4ca618c67b5ac5c8351246879e90a.zip
frameworks_base-0b18c14931c4ca618c67b5ac5c8351246879e90a.tar.gz
frameworks_base-0b18c14931c4ca618c67b5ac5c8351246879e90a.tar.bz2
am 0f50cb31: Merge "Fix build."
* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b': Fix build.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 812d372..ef2f8d0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49100,6 +49100,7 @@ package org.json {
method public org.json.JSONArray put(int, int) throws org.json.JSONException;
method public org.json.JSONArray put(int, long) throws org.json.JSONException;
method public org.json.JSONArray put(int, java.lang.Object) throws org.json.JSONException;
+ method public java.lang.Object remove(int);
method public org.json.JSONObject toJSONObject(org.json.JSONArray) throws org.json.JSONException;
method public java.lang.String toString(int) throws org.json.JSONException;
}