tree c7213938c8a4c05b829a2b46f6ba0041567c6fdb
parent e99819aa8cc397d02255b59b91c6e6850afee3a7
parent 995cef30f64d4b579a76e15c0b622cd79c461dd8
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