tree 976d1a36aa3b20c864dab16448a82c70a2ca33ee
parent ed0de3c123aaa86147993721d4794648a65aab75
parent e8b0071c1656e64bd941debd5dad2ac8b63bbafc
author James Dong <jdong@google.com> 1280343779 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280343779 -0700

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