OSDN Git Service

am 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs...
authorJoe Fernandez <joefernandez@google.com>
Fri, 17 Jan 2014 01:06:34 +0000 (01:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jan 2014 01:06:34 +0000 (01:06 +0000)
commitacc96b79e7941a61d8ca0ec66ec02a887a3e6b1b
tree3670bd177e240d249ee56465fae500c2f9595a3a
parent77be6f94262da49258543fd42c7a3c4235b094a3
parent0a53d549f38c735cf3cc1eacf401bbf906785b26
am 0a53d549: am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs

* commit '0a53d549f38c735cf3cc1eacf401bbf906785b26':
  Fixing bugs in MediaPlayer docs
docs/html/guide/topics/media/mediaplayer.jd