Remove merge markers from preloaded-classes

(cherry picked from commit b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)

Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4

diff --git a/preloaded-classes b/preloaded-classes
index 2d02932..8e8faf4 100644 (file)
--- 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