tree 9a27664a674735fcd92159943da58ad5c5f2a517
parent d2749b71e2b981598d9cabbbfc009ee155a1f14f
parent f9dc1bd1b612af829fb6fae31dc11998c8c02351
author Martijn Coenen <maco@google.com> 1479284676 +0000
committer android-build-merger <android-build-merger@google.com> 1479284676 +0000

Merge "Add atrace calls for systrace support."
am: f9dc1bd1b6

Change-Id: Idd6afbe6f36125e09e4ad3fe6d37abe420d58ca3