am d7ad7710: am 400ae3d4: Merge "Support new systrace file structure after refactor"

* commit 'd7ad7710dd4f0299623650308f27f22dec6fedc2':
  Support new systrace file structure after refactor
This commit is contained in:
Chris Craik
2015-06-23 01:57:32 +00:00
committed by Android Git Automerger

View File

@@ -57,8 +57,12 @@ development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xm
prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip
# systrace
external/chromium-trace/agents/__init__.py platform-tools/systrace/agents/__init__.py
external/chromium-trace/agents/atrace_agent.py platform-tools/systrace/agents/atrace_agent.py
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py
external/chromium-trace/systrace_agent.py platform-tools/systrace/systrace_agent.py
external/chromium-trace/util.py platform-tools/systrace/util.py
external/chromium-trace/systrace_trace_viewer.html platform-tools/systrace/systrace_trace_viewer.html
external/chromium-trace/prefix.html platform-tools/systrace/prefix.html
external/chromium-trace/suffix.html platform-tools/systrace/suffix.html