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

Commit d5f0eb0c authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by Narayan Kamath
Browse files

Remove merge markers from preloaded-classes 

(cherry picked from commit b0868054)

Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
parent 6a8ad6d1

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