tree 05c90b81e5e92fcda3148836a40b42ec5ee2de0d
parent b217f26beaa33f97f3d41e20a89199564d9c4abf
parent c32200a193d08dd721cb5f281ec766967cd20739
author Chris Craik <ccraik@google.com> 1433987463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433987463 +0000

am c32200a1: am f198b96d: Merge "Add native tracing API" into mnc-dev

* commit 'c32200a193d08dd721cb5f281ec766967cd20739':
  Add native tracing API