tree 78add81f4b8235ed0a320ed66a8df1531c9b8373
parent c2a6cae574b71b4b42c8bbbde17ea8796121f0de
parent 0deb7845678f5ed05abf8238121f12bae32848b9
author The Android Open Source Project <initial-contribution@android.com> 1370540334 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370540334 -0700

am 0deb7845: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '0deb7845678f5ed05abf8238121f12bae32848b9':
  systrace: remove the use of a Python 2.7 function
  systrace: add support for older platform versions.