tree 4a8c13d5e22b146d222c181ec1d24947c9d8c727
parent 0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4
parent 240d8a84dec9f9482257a8037457a1d63193b7ff
author Glenn Kasten <gkasten@google.com> 1336692021 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336692021 -0700

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

* commit '240d8a84dec9f9482257a8037457a1d63193b7ff':
  Use audio tag for system tracing