commit | 733bfae99bd97cf70df7a5f222d62d61cbde1893 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Wed Jul 28 12:02:59 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 28 12:02:59 2010 -0700 |
tree | 3be7513bca87cff859124535bc30eb37b92007e2 | |
parent | 28d32cd16ac3e246f35bc06cd79fc27e9b84f613 [diff] | |
parent | cb51115cca81ba47d00aa344f6ed16d1056b056b [diff] |
am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b' * commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b': Interleave the audio and video by default