tree 65d210c1b8bfbbe8c3534a14f44f36f9d3953b5c
parent 60f3d65c831a40897a942513147039eef20d2149
parent 1e96e16f81ce46adf5329b1db4662b53b927d4e2
author Jamie Gennis <jgennis@google.com> 1339531549 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339531549 -0700

am 1e96e16f: am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev

* commit '1e96e16f81ce46adf5329b1db4662b53b927d4e2':
  Enable tracing on user builds