Merge commit '981871922ded799f51b7b8a3e53028d70f37e65c' into eclair-plus-aosp * commit '981871922ded799f51b7b8a3e53028d70f37e65c': Gservices settings for controlling URL scraping in GTalk app.
Merge commit '981871922ded799f51b7b8a3e53028d70f37e65c' into eclair-plus-aosp * commit '981871922ded799f51b7b8a3e53028d70f37e65c': Gservices settings for controlling URL scraping in GTalk app.