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
tree: 548d50b6234296cce4af984c4802aef273541a26
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/