commit 24b1ea1290db6c41cba859a3325b200156708d88
author Daniel Colascione <dancol@google.com> Thu Mar 29 04:51:49 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 29 04:51:49 2018 +0000
tree db208c01106ccef9c421ef67a5898e3a12a7f1c7
parent ffcb285c4b87130db17fdc7c68a59bc7863d9044
parent 97033134d0b4e394861f222b178ebc9987f35e72

Merge "Remove ATRACE_TAG_APP from atrace's control" am: fdc2d23054 am: ad838888c5
am: 97033134d0

Change-Id: I577e296830b1928fa025cfca4d96a57f9b546a78

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index c7b51c8..e3130d6 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -105,7 +105,6 @@
     { "video",      "Video",            ATRACE_TAG_VIDEO, { } },
     { "camera",     "Camera",           ATRACE_TAG_CAMERA, { } },
     { "hal",        "Hardware Modules", ATRACE_TAG_HAL, { } },
-    { "app",        "Application",      ATRACE_TAG_APP, { } },
     { "res",        "Resource Loading", ATRACE_TAG_RESOURCES, { } },
     { "dalvik",     "Dalvik VM",        ATRACE_TAG_DALVIK, { } },
     { "rs",         "RenderScript",     ATRACE_TAG_RS, { } },