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

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