OSDN Git Service

am acc96b79: am 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge...
authorJoe Fernandez <joefernandez@google.com>
Fri, 17 Jan 2014 01:11:47 +0000 (17:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jan 2014 01:11:47 +0000 (17:11 -0800)
* commit 'acc96b79e7941a61d8ca0ec66ec02a887a3e6b1b':
  Fixing bugs in MediaPlayer docs


Trivial merge