tree ea639f688e5a2951159124bea2a93146b93c8762
parent c8c5bc443fe63e96c91fc96bf8db8ce7dd177073
parent 2b7f91b932be0aa9ce6fa3acda9ff439e94643fc
author Eric Laurent <elaurent@google.com> 1320856144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320856144 +0000

am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1

* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback