tree 9eea031bfc8e8b21c40dc07b2b43d0408aca485b
parent 7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998
parent 2553825797c40b14981b1b24e44475e07b02267f
author Jamie Gennis <jgennis@google.com> 1366150709 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366150709 -0700

am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit '2553825797c40b14981b1b24e44475e07b02267f':
  cutils: add a way to disable tracing for a process