diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-11 17:09:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-11 17:10:19 +0000 |
| commit | c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc (patch) | |
| tree | 618c0d4a7f9b28daee03587212b49799ae273e6f | |
| parent | 0f50cb31980c8354a4516094863c4ad0cdd0d03b (diff) | |
| parent | 9444fcae5401d3ad8cab8dd0f5df0151b362175a (diff) | |
| download | base-c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc.tar.gz | |
Merge "Track libcore API update."
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e05a18e6fa33..30db6d84de69 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47961,6 +47961,7 @@ package org.json { ctor public JSONArray(java.util.Collection); ctor public JSONArray(org.json.JSONTokener) throws org.json.JSONException; ctor public JSONArray(java.lang.String) throws org.json.JSONException; + ctor public JSONArray(java.lang.Object) throws org.json.JSONException; method public java.lang.Object get(int) throws org.json.JSONException; method public boolean getBoolean(int) throws org.json.JSONException; method public double getDouble(int) throws org.json.JSONException; @@ -48048,6 +48049,7 @@ package org.json { method public java.lang.Object remove(java.lang.String); method public org.json.JSONArray toJSONArray(org.json.JSONArray) throws org.json.JSONException; method public java.lang.String toString(int) throws org.json.JSONException; + method public static java.lang.Object wrap(java.lang.Object); field public static final java.lang.Object NULL; } |