6123e0f7c9
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp * commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410': Turn the media time adjustment in file writer back on