tree 6374c4ee7c950c25a22235aa051512c8340217d6
parent 86513aafee5f44c680fbd5d6dbed9ce6ae28025f
parent f52450b1f174eac239ffac67774960d547e295c8
author Joe Fernandez <joefernandez@google.com> 1384888841 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384888841 -0800

am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs

* commit 'f52450b1f174eac239ffac67774960d547e295c8':
  Systrace doc updates