OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
815335e
e8a8440
)
am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types...
author
Robert Shih
<robertshih@google.com>
Fri, 1 May 2015 00:57:33 +0000
(
00:57
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 1 May 2015 00:57:33 +0000
(
00:57
+0000)
* commit '
e8a8440d70222750ad9b8563cbc80ca5c563b9c1
':
MediaPlayer: provide mime type for all track types
Trivial merge