commit | 6734a36f96dd5b4fd158321a4b59de3b2a79554b | [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 | 4d989c12a47fc2981d56b149c7ecf93602df506b | |
parent | a0c21c94c35865b0464cae27436f21d50ff1eb31 [diff] | |
parent | ac765f6db6e450c4e8e38bea9439e080d9151485 [diff] |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce