| commit | 5291085d561f290b172e752da08fc3afab85c0b9 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Aug 26 13:15:00 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 26 13:15:00 2010 -0700 |
| tree | 758b338c838ef798f5faba50aa43efeb59983dc5 | |
| parent | bd49bd32eba737b334bb1398fa97ee8c4584a2bf [diff] | |
| parent | 64b531e9a119c2458e48c134fc4385ca074e0d12 [diff] |
am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1' * commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1': Make sure that timestamp does not go backward in MP4 file writer