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:
a475c66
dad0f46
)
am dad0f462: Merge "MediaFormat: added subtitle format" into klp-dev
author
Lajos Molnar
<lajos@google.com>
Fri, 16 Aug 2013 19:23:56 +0000
(12:23 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 16 Aug 2013 19:23:56 +0000
(12:23 -0700)
* commit '
dad0f462ae6fee99840bbea910c810282bbc1c54
':
MediaFormat: added subtitle format
Trivial merge