OSDN Git Service

am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
authorMarco Nelissen <marcone@google.com>
Thu, 29 Nov 2012 19:35:12 +0000 (11:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Nov 2012 19:35:12 +0000 (11:35 -0800)
commit6eb50f7ad52687331e55400a161164a62b8ebd52
tree18a2f828bb2b20997af83c541402a553ae2c763c
parenta6c87d18d0edf49ee5fa7c979f9d41b2febe4062
parent45be8448daafeab8f37cb82cd2219f95bc218a6a
am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."

* commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca':
  Bug fix for the MediaPlayer::prepare() api.