tree a49d05563de9b9b0a162a3c2f50f003ff4430168
parent eaa8fbd0bd71527c10d7594a4afaa1fa33e7a2ed
parent 41af3d253e0d3ce67aa41432504ab9dea06da66f
author James Dong <jdong@google.com> 1280343658 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280343658 -0700

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

Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default