commit a0790bddf8c5e9d6260bb0f9424181da8ffd598d
author Linux Build Service Account <lnxbuild@localhost> Mon Dec 01 06:53:46 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Dec 01 06:53:46 2014 -0800
tree 3f90b1631715981510e4f6bf82fb055fdaf312bc
parent 003d3daffed0904a58d779eb4040c9a13b339c99
parent 787b0de6e16017f886d1f20b56241c81968d5482

Merge "atrace: fix duplicate tag 'sync'"

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 9e5c910..a92f438 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -77,7 +77,7 @@
     { "webview",    "WebView",          ATRACE_TAG_WEBVIEW, { } },
     { "wm",         "Window Manager",   ATRACE_TAG_WINDOW_MANAGER, { } },
     { "am",         "Activity Manager", ATRACE_TAG_ACTIVITY_MANAGER, { } },
-    { "sync",       "Sync Manager",     ATRACE_TAG_SYNC_MANAGER, { } },
+    { "sm",       "Sync Manager",     ATRACE_TAG_SYNC_MANAGER, { } },
     { "audio",      "Audio",            ATRACE_TAG_AUDIO, { } },
     { "video",      "Video",            ATRACE_TAG_VIDEO, { } },
     { "camera",     "Camera",           ATRACE_TAG_CAMERA, { } },