tree 13fd40a3ba766eede97e2e69490ddf2f003ccbce
parent 2af574d815c3d687a7fe56f816342b022c0d711b
parent bc1452a307ac61ca87bf78722701ac85100952af
author James Dong <jdong@google.com> 1283539034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283539034 -0700

am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer

Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'

* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
  Remove unused/debugging code from MP4 file writer