am 4cd5703b: am 75b64a1b: am ca483765: Merge "Fix the duplication in the debugging code."

* commit '4cd5703b9eef30a32271819503808576666e1601': Fix the duplication in the debugging code.
2013-01-22 10:05:19 -08:00
parent 1136b7d821 4cd5703b9e
commit 16f7b78fd1
25 changed files with 430 additions and 632 deletions
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -13,7 +13,6 @@ LOCAL_SRC_FILES:= \
    dlfcn.cpp \
    linker.cpp \
    linker_environ.cpp \
-    linker_format.cpp \
    linker_phdr.cpp \
    rt.cpp