commit 9c8685b714b38c2bbf09077b9cba73a95b734269
author Elliott Hughes <enh@google.com> Thu Jul 11 18:55:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 11 18:55:54 2013 -0700
tree de9803fe3c9f00c9702da69f84a1bca1aedfaa15
parent a1063aa3fb6619caf59c2c139c1800a427bbafb5
parent f094eefc34013c7167effa558b488709eaa54751

am f094eefc: am c5de9c35: Merge "Track libcore API update."

* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9eee2f4..962b332 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49068,6 +49068,7 @@
     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;
@@ -49155,6 +49156,7 @@
     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;
   }