OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
391daa2
5676e25
)
am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
author
Marco Nelissen
<marcone@google.com>
Thu, 29 Nov 2012 19:33:11 +0000
(11:33 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 29 Nov 2012 19:33:11 +0000
(11:33 -0800)
* commit '
031c93df74621dc2149876dc377aedee8930547f
':
Bug fix for the MediaPlayer::prepare() api.
Trivial merge