commit | 94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a | [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 | 650891e28499466a99d6a424732ac87cc3da4b5f | |
parent | 3aebab17d67d7acbf8da17d69a0e51f9cd428c35 [diff] | |
parent | dca875bd0bc713c809e319ddb0adc3bab2d080a6 [diff] |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce