am 1e31ed01: am 98187192: Merge change 24014 into eclair
am 1e31ed01: am 98187192: Merge change 24014 into eclair

Merge commit '1e31ed013abeb2d15868a57e64e4ce25746595a9'

* commit '1e31ed013abeb2d15868a57e64e4ce25746595a9':
  Gservices settings for controlling URL scraping in GTalk app.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base