OSDN Git Service

am a1a67123: am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into...
authorztenghui <ztenghui@google.com>
Wed, 10 Apr 2013 18:35:43 +0000 (11:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Apr 2013 18:35:43 +0000 (11:35 -0700)
* commit 'a1a67123245321d970058d668ca50bb218bddb19':
  Use MediaMuxer for the video trim and mute.


Trivial merge