Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6187f4c3 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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 '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
parents 132a0192 e1d522cc

There are no changes