| commit | 7f6ff8eb6eed438590e24f0b536c65110976bcfb | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Oct 21 20:27:34 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 20:27:34 2010 -0700 |
| tree | 8e3a5bf118cec5b219dd45fe1157b70250e9663d | |
| parent | 46818115e1b5e7b41ab1ccbd6a863f164f0d3425 [diff] | |
| parent | ddcd04f2b3fef095e9f4020d5f87b7259e6921e9 [diff] |
am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227' * commit '6123e0f7c91ffc7534da99b4668879dacf662227': Turn the media time adjustment in file writer back on