tree 04d0578979d21982968e22c08955b230e2b6673e
parent 72f204de1f5399ec4db3fbbd441394a466bd1289
parent ce1340c665e8840c8856898bbfb7ee3b33765359
author Colin Cross <ccross@android.com> 1389290454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290454 +0000

am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"

* commit 'ce1340c665e8840c8856898bbfb7ee3b33765359':
  Fix tracing on user builds