| commit | 238464264567ac94cc8abd48e7c6a1458f323715 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:38:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:38:54 2013 -0700 |
| tree | 78add81f4b8235ed0a320ed66a8df1531c9b8373 | |
| parent | c2a6cae574b71b4b42c8bbbde17ea8796121f0de [diff] | |
| parent | 0deb7845678f5ed05abf8238121f12bae32848b9 [diff] |
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.