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:
979df01
2c3d9b7
)
am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
author
Jean-Baptiste Queru
<jbq@google.com>
Wed, 15 Aug 2012 18:24:36 +0000
(11:24 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 15 Aug 2012 18:24:36 +0000
(11:24 -0700)
* commit '
2c3d9b7b9e34c9122c0a568d6b1fb24404021f55
':
MPEG2TSWriter: Correctly add padding using the adaptation field
Trivial merge