| commit | d554dc3643fa1643f27b976857e4d4c99295af0e | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Fri May 31 11:09:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 31 11:09:11 2013 -0700 |
| tree | 0d65770f2086d1ccc7196591fa00061df08a9482 | |
| parent | 5f7cb2824f158d0dfdfcb68c9252e23d3df3f550 [diff] | |
| parent | 43590eb76cac78f780dd318492c5fe6093e2fa88 [diff] |
am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev * commit '43590eb76cac78f780dd318492c5fe6093e2fa88': MediaMuxer sample code update, no functional change