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