am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default -...
am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit 'cb51115c'
* commit 'cb51115c':
Interleave the audio and video by default