tree e2ad3e5b0562d6b0e7a4059eb5cc979d3e5c5998
parent 3722abe1a6ae53034b9dee6b12e8513804622fd5
parent 40f0e35c1dfef812084a68f5ccb4083b572718aa
author James Dong <jdong@google.com> 1280344897 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280344897 -0700

am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested

Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
  Reduce memory usage by the MP4 file writer