commit 03e83d4ad909f5c07fb2011e03348a413453e909
author Andreas Huber <andih@google.com> Mon Aug 30 16:16:03 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 16:16:03 2010 -0700
tree c660d84030d3ea91fbd6e54a555f2fc49286f694
parent 987556bc9bc1a61415b6e65bd600b8daf5b24d30
parent 68ae91cbd20939e48ad15c15405048e7ff9fe2f8

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 '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp

* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
  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.