tree 4a8c13d5e22b146d222c181ec1d24947c9d8c727
parent 5a8a338e5950716997c42cae9d5247ce0fc743eb
parent df39376eb12fc9dca87058560e58072f47dfc1a4
author Glenn Kasten <gkasten@google.com> 1336692145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336692145 -0700

am df39376e: am 240d8a84: Merge "Use audio tag for system tracing" into jb-dev

* commit 'df39376eb12fc9dca87058560e58072f47dfc1a4':
  Use audio tag for system tracing