OSDN Git Service

am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into ginge...
authorJames Dong <jdong@google.com>
Fri, 22 Oct 2010 03:18:16 +0000 (20:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 03:18:16 +0000 (20:18 -0700)
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on


Trivial merge