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
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.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base