commit | 627d836ffff9084ba594a772491c8b91a2ce2d0a | [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 | 2e4b21814c8055e0233dc11536ca2ed66ff794eb | |
parent | 1b36424419fcfb977a1c81581a2ee685df1fd1f8 [diff] | |
parent | 6123e0f7c91ffc7534da99b4668879dacf662227 [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