tree f31849741174271ef05d467504b3c04a113fcb81
parent ec17c5c8d5d904db64da0f3755552f370837ddec
parent 8dd41fb992668b67db9a0899f5d1768680a55620
author Narayan Kamath <narayan@google.com> 1316016791 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316016791 -0700

am 8dd41fb9: Merge "Don\'t wait indefinitely for audio tracks to finish playing."

* commit '8dd41fb992668b67db9a0899f5d1768680a55620':
  Don't wait indefinitely for audio tracks to finish playing.