commit 6a8ad6d161d6846311267f5e4aa933b8490bc821
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Nov 03 09:47:56 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Dec 22 13:10:55 2015 +0000
tree f41e7987150b0a4757572f6866e6c79559b015ad
parent 62671eaa465a8968d543e91129a976f27e500cb3

Move StrictJarFile from libcore to framework

Bug: 25337946

(cherry picked from commit 8a7c1606d88873c5a1b5764c16cb046b6f2275b2)

Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee

preloaded-classes

diff --git a/preloaded-classes b/preloaded-classes
index be1f1c5..2d02932 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -1765,6 +1765,7 @@
 android.util.SuperNotCalledException
 android.util.TypedValue
 android.util.Xml
+android.util.jar.StrictJarFile
 android.view.AbsSavedState
 android.view.AbsSavedState$1
 android.view.AbsSavedState$2
@@ -3361,9 +3362,6 @@
 java.util.jar.JarEntry
 java.util.jar.JarFile
 java.util.jar.JarFile$JarFileEnumerator
-java.util.jar.Manifest
-java.util.jar.ManifestReader
-java.util.jar.StrictJarFile
 java.util.logging.ConsoleHandler
 java.util.logging.ErrorManager
 java.util.logging.Filter
@@ -3824,4 +3822,11 @@
 org.xmlpull.v1.XmlPullParser
 org.xmlpull.v1.XmlPullParserException
 org.xmlpull.v1.XmlSerializer
+<<<<<<< HEAD
 sun.misc.Unsafe
+=======
+<<<<<<< HEAD
+=======
+sun.misc.Unsafe
+>>>>>>> 631d21f... Move StrictJarFile from libcore to framework
+>>>>>>> 43ea2cc... DO NOT MERGE Move StrictJarFile from libcore to framework