commit 7c6061ed4b70a97eccd1c0be444efd3efb7afb92
author Josh Gao <jmgao@google.com> Tue Dec 13 00:42:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 00:42:56 2016 +0000
tree 77c4d1cb33ac1ee84a2eb51a2911948fe13e60a4
parent 6b7f8a94af474a3b2c8ac702824a5f8d3f1eddcd
parent 0deeeac8d1e3654b86e9840f14602a42ff9885f4

Merge "atrace: introduce tracing category for adb." am: 3c9a97902d
am: 0deeeac8d1

Change-Id: I73946e269c69e15974b5a74693063b0c12b13f4e

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f4c6be2..c176101 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -109,6 +109,7 @@
     { "ss",         "System Server",    ATRACE_TAG_SYSTEM_SERVER, { } },
     { "database",   "Database",         ATRACE_TAG_DATABASE, { } },
     { "network",    "Network",          ATRACE_TAG_NETWORK, { } },
+    { "adb",        "ADB",              ATRACE_TAG_ADB, { } },
     { k_coreServiceCategory, "Core services", 0, { } },
     { "sched",      "CPU Scheduling",   0, {
         { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },