tree a44a2e6076f799b0546b341fd9e059c377df4fee
parent 3dcfb7f107916445cd378d530a6a69175128d0c7
parent 3929efb9d480b8893eb3e95cd282dd161ab8fb12
author Jamie Gennis <jgennis@google.com> 1379532352 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379532352 -0700

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

* commit '3929efb9d480b8893eb3e95cd282dd161ab8fb12':
  trace: Add support for tracing 64-bit ints.