tree 412412da3adfb15a9d0d317143b0d7d206fdd5c1
parent 18c34183d76be2efbf2f498ec0185c1ceffa49f0
parent 9d773b978b9fc26fb08a973e0290aba5432b720a
author Jamie Gennis <jgennis@google.com> 1379532083 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379532083 -0700

am 9d773b97: Merge "trace: Add support for tracing 64-bit ints." into klp-dev

* commit '9d773b978b9fc26fb08a973e0290aba5432b720a':
  trace: Add support for tracing 64-bit ints.