commit 394f27dafd130976c80f01e9086de493d4af9023
author Andreas Huber <andih@google.com> Tue Aug 10 13:01:58 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 10 13:01:58 2010 -0700
tree 509b165a9c92abd77498666313483d9216648e5b
parent 20e38dfac6333e8fe456d2083927a86580c1500d
parent dd05839d2d8687c3d7ac761ce2beb2388ac374c0

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 gingerbread

Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
  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.