tree fc5e4b923e6384b5d71c26730eab9a8225c6e350
parent ebf213fc38ff39c680e539479d164b54fc6b1bc4
parent 8ef243cf861044eec35ee3d8207561251e34c77c
author Victoria Lease <violets@android.com> 1362527626 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362527626 +0000

am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually"

* commit '8ef243cf861044eec35ee3d8207561251e34c77c':
  Audio continue to played even if paused manually