tree f2fc90ba890a428fcecffc79642559c64f0a8731
parent 2858ca9e282b10afd67da73885e3a25e82e510a6
parent dd65a4f735a311fe60c065449e394974807ff297
author Narayan Kamath <narayan@google.com> 1420481286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420481286 +0000

am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"

* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release