commit 1debd697581f97cc271d740c835102b740b1f121
author Yasuhiro Matsuda <mazda@google.com> Wed Sep 02 13:14:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 02 13:14:08 2015 +0000
tree 1459d7de9511ce4cf522cb9319f4bc53fbe4d5de
parent fe54df2ad3244d1cb745a6aac868654f0fc05315
parent d8ffffa9b660e8ee4b7294b8b2422d05829dfb7e

am d8ffffa9: am 40a8bb3b: Merge "Add a tag for tracing system server."

* commit 'd8ffffa9b660e8ee4b7294b8b2422d05829dfb7e':
  Add a tag for tracing system server.

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 8bda880..cdf3a50 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -92,6 +92,7 @@
     { "bionic",     "Bionic C Library", ATRACE_TAG_BIONIC, { } },
     { "power",      "Power Management", ATRACE_TAG_POWER, { } },
     { "pm",         "Package Manager",  ATRACE_TAG_PACKAGE_MANAGER, { } },
+    { "ss",         "System Server",    ATRACE_TAG_SYSTEM_SERVER, { } },
     { "sched",      "CPU Scheduling",   0, {
         { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
         { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },