OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f19c0c 6ad1fb7)
am 6ad1fb77: am 3064e8d5: am 1b98ab33: Merge "MediaPlayer: documentation for error...
authorRobert Shih <robertshih@google.com>
Sat, 20 Jun 2015 00:23:09 +0000 (00:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 20 Jun 2015 00:23:09 +0000 (00:23 +0000)
* commit '6ad1fb7757cf8a84492313890c31e0dd7aafbe4d':
  MediaPlayer: documentation for error/info codes.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help