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