commit 47416bc4f9beb4147b29bb9d93653a4aa356c37d
author Andreas Huber <andih@google.com> Mon Aug 30 16:19:55 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 16:19:55 2010 -0700
tree fa3a4b434ab5ed7d63b0c2fab1a5ca4d6a8e7980
parent 69245638682dfb310651e37a340153bf7ad52ac0
parent 03e83d4ad909f5c07fb2011e03348a413453e909

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.