OSDN Git Service

Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
authorztenghui <ztenghui@google.com>
Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)

Trivial merge