Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0868054 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak
Browse files

Remove merge markers from preloaded-classes 

Change-Id: I8267fc4cd41868f406e32a64ee750c0e5ca6098d
parent c93546ed

preloaded-classes

+0 −7
Original line number Diff line number Diff line
@@ -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