tree f929f4ebaf1c0ce6488a2bb499e38f361ab5256c
parent 6c825d49b77b1b257b59a30c24792d1bf0f5df84
parent bb2e031ace9072a0bd71f6316269f3060f04aa27
author Jamie Gennis <jgennis@google.com> 1365547195 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365547195 -0700

am bb2e031a: am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev

* commit 'bb2e031ace9072a0bd71f6316269f3060f04aa27':
  Add APIs for application-generated systrace events