tree ff617d463fdfb8d2d63e2b5920fbc7e2df510d31
parent d4b9d56992ee89d950943f04bb2b8d4f6b8af2ba
parent 8a6dbce54b814b453eb8ff4d86257c5770918f7e
author Glenn Kasten <gkasten@google.com> 1335982267 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335982267 -0700

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

* commit '8a6dbce54b814b453eb8ff4d86257c5770918f7e':
  Fix race in AudioTrack destruction