tree 07de0272ea30b44c74bfd3cdb18bb97abdae9e5e
parent 741c9c74ffead322c349242e3f72e8fd2957bd3d
parent dcf78a0541665332792d3f645dda673a9add2c1e
author Joe Fernandez <joefernandez@google.com> 1384888590 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384888590 -0800

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

* commit 'dcf78a0541665332792d3f645dda673a9add2c1e':
  Systrace doc updates