am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer...
am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '6123e0f7'
* commit '6123e0f7':
Turn the media time adjustment in file writer back on