OSDN Git Service

am b175c757: am fd020e65: am 15ff1b1c: The trimming solution with the mp4parser library.
authorTeng-Hui Zhu <ztenghui@google.com>
Mon, 24 Sep 2012 20:48:16 +0000 (13:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 20:48:16 +0000 (13:48 -0700)
* commit 'b175c7573d84bc740f3e5cca2dc89d976f4d3c28':
  The trimming solution with the mp4parser library.


Trivial merge