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: be93e29d294a7f664e2a44eb888c790f7218cbed
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/