tree 1b6a89146b57ce35592bbda05b22f980b4488098
parent b84a3dde3583c7c8696679ffaad25c334e85e3cb
parent 0faebfb2f5a07939e7264a94fdcebecc4df39873
author John Reck <jreck@google.com> 1427415701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427415701 +0000

am 0faebfb2: Merge "Add trace_event_clock_sync to atrace"

* commit '0faebfb2f5a07939e7264a94fdcebecc4df39873':
  Add trace_event_clock_sync to atrace