tree 510db1ba5a00781f7ef2359ef39e1c50ca885e14
parent 032d7bf04b9adb79bcb2267bf18a1d6552f00fe9
parent 836202974fdabd16d94c4b7589721267bca6b58d
author Siva Velusamy <vsiva@google.com> 1374526828 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374526828 -0700

am 83620297: am 31cc1650: Merge "Release systrace into platform-tools" into jb-mr2-dev

* commit '836202974fdabd16d94c4b7589721267bca6b58d':
  Release systrace into platform-tools