tree a31ebeaa0263effa8bedaf6b3c260913c9c6318e
parent 8bba28e34be496e7bd0f047711477f6597b51dc5
parent f2861d6b867827ec752930e12825f278ab7cebab
author Eric Laurent <elaurent@google.com> 1336174577 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336174577 -0700

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

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