commit 14982abab191ab0fff50dcb64da442cd6645fa7e
author The Android Automerger <android-build@google.com> Tue Oct 21 06:16:20 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 21 06:16:20 2014 -0700
tree f2807868aa6d1a12c3f03b5b171cd20f0242ba4b
parent a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2
parent b9bb0e85379f73fde1e8129f65ef3377b9259917

merge in lmp-release history after reset to a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 3659676..b2668ce 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -58,7 +58,6 @@
 #endif
 
 #if FAKE_LOG_DEVICE
-#define WEAK __attribute__((weak))
 static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 };
 #else
 static int logd_fd = -1;
@@ -274,7 +273,7 @@
     [LOG_ID_CRASH] = "crash"
 };
 
-const WEAK char *android_log_id_to_name(log_id_t log_id)
+const char *android_log_id_to_name(log_id_t log_id)
 {
     if (log_id >= LOG_ID_MAX) {
         log_id = LOG_ID_MAIN;