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