tree 1611c40a74417db01eb925f0759d0cf542d22b7b
parent 5ca7d87fe47ad18594b5c5f79d00aa86ed1435cb
parent 5a3696297b2f8d463ba601772df7af5966321d2e
author Colin Cross <ccross@android.com> 1389290308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290308 +0000

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

* commit '5a3696297b2f8d463ba601772df7af5966321d2e':
  Fix tracing on user builds