tree a5843e6189379fa7d4e072d3e08fdda0271fd39c
parent 792f3b2e9ef31876567a1e28ab5d2d9af514e4a0
parent 50a9908f987fd5a73d8a95d6fe46b530386cdc86
author James Dong <jdong@google.com> 1337128111 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337128111 -0700

am 50a9908f: Merge "Speed up stsz box write in MPEG4Writer" into jb-dev

* commit '50a9908f987fd5a73d8a95d6fe46b530386cdc86':
  Speed up stsz box write in MPEG4Writer