OSDN Git Service

am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
authorMarco Nelissen <marcone@google.com>
Thu, 29 Nov 2012 19:33:11 +0000 (11:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Nov 2012 19:33:11 +0000 (11:33 -0800)
* commit '031c93df74621dc2149876dc377aedee8930547f':
  Bug fix for the MediaPlayer::prepare() api.


Trivial merge