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)
commit94abba848d3a5070746f76fb6ad09e1177c0330b
tree287f6ac69901b9487cf3ea0a6b163c12fa31b3f1
parentd3c2a02ac3749ce3aabd420112d5165f6eb9354b
parent3eb2fb4dd2ede7f65ee307061213f0e8860f15f6
am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce

* commit '3eb2fb4dd2ede7f65ee307061213f0e8860f15f6':
  Use MediaMuxer for the video trim and mute.