tree 6d0e22cf58988fcd5e96fa0edeb60b36ce4b4daf
parent ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea
parent b13ea45a04a463646a7098b03f9f64d91b29d2b9
author Jamie Gennis <jgennis@google.com> 1366150367 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366150367 +0000

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