tree a31ebeaa0263effa8bedaf6b3c260913c9c6318e
parent 4ded4983983aa8597e927d3a7f0dc241fa993951
parent fc52dd88e4d2f433feba5d5aaff1880659d46319
author Eric Laurent <elaurent@google.com> 1336170262 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336170262 -0700

am fc52dd88: Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev

* commit 'fc52dd88e4d2f433feba5d5aaff1880659d46319':
  Revert "Merge "Improve AudioPlayer position reporting""