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
tree: 976d1a36aa3b20c864dab16448a82c70a2ca33ee
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/