tree 14ccc29bf190db41515f0894e0ff841d70fc9f66
parent c9612fa6a032a5905a4c9b057de810f9d5425a29
parent a3a75d956e502f924dc29f4f29c7d46f0f8e4e56
author Jamie Gennis <jgennis@google.com> 1339537958 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339537958 -0700

am a3a75d95: am b9314021: atrace: enable running on user builds

* commit 'a3a75d956e502f924dc29f4f29c7d46f0f8e4e56':
  atrace: enable running on user builds