commit d2a92b5b97b5a107d327744f216abdea8e0cda89
author Jamie Gennis <jgennis@google.com> Tue May 07 18:23:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 07 18:23:18 2013 -0700
tree 0a18ab0a646783aa1cd4ffc28e2d07e1cb406792
parent 2c2283549c72184145c9f030bbfe6124ee75d169
parent db733579a4c64eddd7dadb4ac15f54658ccfc0fb

am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev

* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
  atrace: add the 'dalvik' trace category

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 06e9744..1911839 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -81,6 +81,7 @@
     { "camera",     "Camera",           ATRACE_TAG_CAMERA, { } },
     { "hal",        "Hardware Modules", ATRACE_TAG_HAL, { } },
     { "res",        "Resource Loading", ATRACE_TAG_RESOURCES, { } },
+    { "dalvik",     "Dalvik VM",        ATRACE_TAG_DALVIK, { } },
     { "sched",      "CPU Scheduling",   0, {
         { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
         { REQ,      "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },