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

Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp

* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
  Keep gtalk video chat specific code consistent with rtsp changes.
tree: 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE