tree 382d6b41094cb7c98fa38b8649aa542bd6150829
parent a74ead0fd6f96e4c4c6d0b5f2b1d0d2448fc81fd
parent 4082bf8c963dbd44fe2f6367fa687217cbac58d3
author Colin Cross <ccross@android.com> 1389290593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290593 +0000

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

* commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3':
  Fix tracing on user builds