tree c2812512361be135ca0839d4296764ca377fcdb3
parent b62029edb6e0f97759ffb6d8f587267bee2dc31b
parent d81ef83a493a27887b795fdf9ece391155779914
author Andreas Huber <andih@google.com> 1283210395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283210395 -0700

am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread

Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'

* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
  Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.