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:
436efe9
10b3b86
)
am bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings...
author
Andreas Huber
<andih@google.com>
Wed, 21 Sep 2011 20:57:54 +0000
(13:57 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 21 Sep 2011 20:57:54 +0000
(13:57 -0700)
* commit '
bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23
':
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
Trivial merge