commit da4cfdfbdf6e37067b589acc4edd77ef476ffdd8
author Orion Hodson <oth@google.com> Thu Jan 19 13:47:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 19 13:47:37 2017 +0000
tree ed8f8e6b7157012cede486ef4cf4bced4db283bb
parent 56a2ae1056a5692071ee1b507b07c8e828ec2e8d
parent a08d67495c25318db0c2c1e92d3f6cd05e110165

Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am: e5c3aed8dc
am: a08d67495c

Change-Id: I4ea03fd453e58737b795c9f856db6a8312fdd1a0

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 871ec87..227cc6e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49095,6 +49095,10 @@
     method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
   }
 
+  public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+    ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
+  }
+
   public class PathClassLoader extends dalvik.system.BaseDexClassLoader {
     ctor public PathClassLoader(java.lang.String, java.lang.ClassLoader);
     ctor public PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 8931535..8269e6a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -52695,6 +52695,10 @@
     method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
   }
 
+  public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+    ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
+  }
+
   public class PathClassLoader extends dalvik.system.BaseDexClassLoader {
     ctor public PathClassLoader(java.lang.String, java.lang.ClassLoader);
     ctor public PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index cb6e1a3..485fd7b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -49186,6 +49186,10 @@
     method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
   }
 
+  public final class InMemoryDexClassLoader extends java.lang.ClassLoader {
+    ctor public InMemoryDexClassLoader(java.nio.ByteBuffer, java.lang.ClassLoader);
+  }
+
   public class PathClassLoader extends dalvik.system.BaseDexClassLoader {
     ctor public PathClassLoader(java.lang.String, java.lang.ClassLoader);
     ctor public PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);