OSDN Git Service

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


Trivial merge