resolved conflicts for merge of ab5b8603 to master

Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea
2014-06-27 11:25:37 -07:00 · 2014-06-27 11:25:37 -07:00 · d4b6d18d7e
commit d4b6d18d7e
parent e29cbd3372 ab5b8603ee
1 changed files with 2 additions and 1 deletions
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@ -486,7 +486,8 @@ static void dump_log_file(
    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;
    }