am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp...
am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '412fc7cd' into gingerbread-plus-aosp
* commit '412fc7cd':
Keep gtalk video chat specific code consistent with rtsp changes.