| commit | 95c929cb8d4cfbdaa189a0822a870ed3c70bfb21 | [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 | 37a8404b564737b82753e7ad22fe1614b6d6c3d7 | |
| parent | ad98b1677e0475f761f1b23df3d699576ac757ef [diff] | |
| parent | 2418a4974f2a9d7ad55c2460f2c20c36e44c4c65 [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