tree 24e5c93b81a6bb707e85494d4d2c61b362af85c1
parent e8b0071c1656e64bd941debd5dad2ac8b63bbafc
parent 8644c14618d30d9e57a69df40ed939986ebf02c4
author James Dong <jdong@google.com> 1280344773 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280344773 -0700

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 '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp

* commit '7e397842d53a4242a019daa4b234910273121c30':
  Reduce memory usage by the MP4 file writer