Merge commit 'e9506e3684c36a62533211022541997034088d2f' into eclair-plus-aosp * commit 'e9506e3684c36a62533211022541997034088d2f': Add Gservices settings required for carrier billing.
Merge commit 'e9506e3684c36a62533211022541997034088d2f' into eclair-plus-aosp * commit 'e9506e3684c36a62533211022541997034088d2f': Add Gservices settings required for carrier billing.