Merge commit '96f8613d95122a491a44f755f06845cc2c13e81e' into eclair-plus-aosp * commit '96f8613d95122a491a44f755f06845cc2c13e81e': Add Gservices constants for GlobalSearch settings
Merge commit '96f8613d95122a491a44f755f06845cc2c13e81e' into eclair-plus-aosp * commit '96f8613d95122a491a44f755f06845cc2c13e81e': Add Gservices constants for GlobalSearch settings