| commit | 9b5d15ccd07690493300eb35f43f432664a2b14d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 15 11:29:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 11:29:23 2012 -0700 |
| tree | 1eb4bb0d5b4afb8738ae047b73b67a7ebf49a539 | |
| parent | 068515d953ddd3241741e89bf42349c6298a403c [diff] | |
| parent | ff42ad8716cf956918976821ba9625b7814c8b09 [diff] |
am ff42ad87: am ce088d27: am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" * commit 'ff42ad8716cf956918976821ba9625b7814c8b09': MPEG2TSWriter: Correctly add padding using the adaptation field