tree 083c51e9a84fe30a27006f04ed869cc71383b3f0
parent 9761530b3fbff0f2d686c4a0f48efa02c159a309
parent 12020cf4418fd5b0918b6df1d6a072be01aac622
author Rich Slogar <rslogar@google.com> 1428951194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428951194 +0000

am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit '12020cf4418fd5b0918b6df1d6a072be01aac622':
  docs: systrace update