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)
commit3eb2fb4dd2ede7f65ee307061213f0e8860f15f6
tree99a4303ca7032c0b4169582e1953c567b1aaa808
parent2fc6641b80a7aedf54062cbd01c40cbf0764a6ca
parent8b9de91b3c01664b24deda202acb5db8594db503
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce