tree e08c3de2d50635ffec71e0d645de9cecbe1331f0
parent e6a1f57b03cda4273495e8392ea7a676310ac2f9
parent b7b2c71bf8bf685af4c716e78d5c70decab98b54
author Jamie Gennis <jgennis@google.com> 1366150910 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366150910 -0700

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

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