commit 3965148396c1dbd70c12ade2cb21c495d99f1ea7
author Andreas Huber <andih@google.com> Tue Aug 10 13:04:42 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 10 13:04:42 2010 -0700
tree 155afbe89d6c55adaf7ce857acd44e792be2106f
parent 623ee2a569bddc34f044c475867d4b6d3eeb1153
parent 4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28

am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea

Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'

* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.