commit | ddcd04f2b3fef095e9f4020d5f87b7259e6921e9 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Oct 21 20:18:16 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 20:18:16 2010 -0700 |
tree | 2d0c7d4c0e48f2e0e3989406d4bd9f683ec961b3 | |
parent | 8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb [diff] | |
parent | 12ac08f2e1ffb74fd4efdc726066db15e6d3d50d [diff] |
am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp * commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410': Turn the media time adjustment in file writer back on