diff options
| -rw-r--r-- | preloaded-classes | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/preloaded-classes b/preloaded-classes index 2d02932b2471..8e8faf463a94 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -3822,11 +3822,4 @@ org.xml.sax.helpers.DefaultHandler 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 |