am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward...
am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Merge commit '9509a0ce'
* commit '9509a0ce':
Make sure that timestamp does not go backward in MP4 file writer