tree ff617d463fdfb8d2d63e2b5920fbc7e2df510d31
parent 38f45a53ff1a19d3a6440e03a579b23186267062
parent 428a59d9f6deb548f46151e7c7962aa204f13cf0
author Glenn Kasten <gkasten@google.com> 1335982103 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335982103 -0700

am 428a59d9: Merge "Fix race in AudioTrack destruction" into jb-dev

* commit '428a59d9f6deb548f46151e7c7962aa204f13cf0':
  Fix race in AudioTrack destruction