am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread

Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96'

* commit '47f2cf620731226a9311db0f864a4e1404e54b96':
  Keep gtalk video chat specific code consistent with rtsp changes.