OSDN Git Service

am 1b98ab33: Merge "MediaPlayer: documentation for error/info codes." into mnc-dev
authorRobert Shih <robertshih@google.com>
Fri, 19 Jun 2015 23:57:13 +0000 (23:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jun 2015 23:57:13 +0000 (23:57 +0000)
* commit '1b98ab33281f0000ac3f1c12e9cb2b4dfb0a2bb6':
  MediaPlayer: documentation for error/info codes.


Trivial merge