OSDN Git Service

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


Trivial merge