Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove merge markers from preloaded-classes

Browse Source 
Change-Id: I8267fc4cd41868f406e32a64ee750c0e5ca6098d
This commit is contained in:
Przemyslaw Szczepaniak
2015-12-02 11:32:22 +00:00
parent c93546ed73
commit b086805472
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
preloaded-classes
View File

@@ -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