tree 548d50b6234296cce4af984c4802aef273541a26
parent 90e4b45495f806f937fcdb52e18842237fccd5fb
parent 640a72ecf2feb1ee5152d70234ff48d3be0e5ddf
author James Dong <jdong@google.com> 1282841610 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282841610 -0700

am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread

Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer