tree 5337f49e60c9de28ae1d0ca6c3595ae25622a19e
parent ee8b7dd139d74fd4ca321169a23c314fdf1c74b9
parent dc7747d7da61a72b6d26dacf7569de9455d77474
author Glenn Kasten <gkasten@google.com> 1316627647 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316627647 -0700

am faa75f61: Merge "Bug 5234242 audio continues after discontinuity"

* commit 'faa75f6146165016685291084ca79ddd377411b4':
  Bug 5234242 audio continues after discontinuity