| commit | 3eb2fb4dd2ede7f65ee307061213f0e8860f15f6 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Wed Apr 10 18:19:57 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 10 18:19:57 2013 +0000 |
| tree | 99a4303ca7032c0b4169582e1953c567b1aaa808 | |
| parent | 2fc6641b80a7aedf54062cbd01c40cbf0764a6ca [diff] | |
| parent | 8b9de91b3c01664b24deda202acb5db8594db503 [diff] |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce