tree 4e883dfdcce0f6fc32f7d48809de8c5d6c22c6dc
parent a199880a01d65779ab48131ab98f131d8fb4e341
parent b7974bd31d06d439cb75f8a3a0ad032fa689c729
author Narayan Kamath <narayan@google.com> 1420481433 +0000
committer android-build-merger <android-build-merger@google.com> 1420481433 +0000

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

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