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