commit d4b6d18d7e6b8c2a11ee0b9bd8a0e3bdaf819b23
author Mark Salyzyn <salyzyn@google.com> Fri Jun 27 11:25:37 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Jun 27 11:25:37 2014 -0700
tree 0d4c292420ed83bac9ccfbb302b140dcf5ea6fec
parent e29cbd3372e5af761d3c2423723182acf6951166
parent ab5b8603ee70ecd04f9dda8ca0ee15789c32ca84

resolved conflicts for merge of ab5b8603 to master

Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 8493231..dea016d 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -486,7 +486,8 @@
     entry = &log_entry.entry_v1;
 
     if (first) {
-      _LOG(log, logtype::HEADER, "--------- %slog %s\n", tail ? "tail end of " : "", filename);
+      _LOG(log, logtype::LOGS, "--------- %slog %s\n",
+        tail ? "tail end of " : "", filename);
       first = false;
     }