Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
tree: 7f28936b13ecbea2c4a72452f50a3dc2e825b264
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/