commit b0868054720a05d9e6d8ef6ee7e4c8c2d176f456
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Wed Dec 02 11:32:22 2015 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Wed Dec 02 11:32:22 2015 +0000
tree 8f7f4fc052d4bf399016d11a2e4d0e7626810d69
parent c93546ed73467714fa528d4c026b2269aef90ec4

Remove merge markers from preloaded-classes

Change-Id: I8267fc4cd41868f406e32a64ee750c0e5ca6098d

preloaded-classes

diff --git a/preloaded-classes b/preloaded-classes
index e44b25e..2301c41 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -3822,11 +3822,4 @@
 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