Merge change 24014 into eclair

* changes:
  Gservices settings for controlling URL scraping in GTalk app.
tree: fdad147c772d6e71d4a3a8aba169e09a5b41c3ee
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE