diff options
| author | 2015-12-02 11:32:22 +0000 | |
|---|---|---|
| committer | 2015-12-22 13:10:55 +0000 | |
| commit | d5f0eb0c8437e8d0b9d03552ef369aef158c89c3 (patch) | |
| tree | 86a2612a9eadb08b0dafe7dceebdb49f4b1d86df | |
| parent | 6a8ad6d161d6846311267f5e4aa933b8490bc821 (diff) | |
Remove merge markers from preloaded-classes
(cherry picked from commit b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)
Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
| -rw-r--r-- | preloaded-classes | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/preloaded-classes b/preloaded-classes index 2d02932b2471..8e8faf463a94 100644 --- 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 |