am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1' * commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1': Make sure that timestamp does not go backward in MP4 file writer
This commit is contained in:
commit
6187f4c307