am f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev

* commit 'f44e9f91f37d3fbed64bc952f241d5dc3c385b6a':
  atrace: add the webview category
This commit is contained in:
Jamie Gennis 2013-03-12 19:22:52 +00:00 committed by Android Git Automerger
commit 3b039784c0

View File

@ -72,6 +72,7 @@ static const TracingCategory k_categories[] = {
{ "gfx", "Graphics", ATRACE_TAG_GRAPHICS, { } },
{ "input", "Input", ATRACE_TAG_INPUT, { } },
{ "view", "View System", ATRACE_TAG_VIEW, { } },
{ "webview", "WebView", ATRACE_TAG_WEBVIEW, { } },
{ "wm", "Window Manager", ATRACE_TAG_WINDOW_MANAGER, { } },
{ "am", "Activity Manager", ATRACE_TAG_ACTIVITY_MANAGER, { } },
{ "audio", "Audio", ATRACE_TAG_AUDIO, { } },