Merge change 25561 into eclair

* changes:
  Add Gservices settings required for carrier billing.

core/java/android/provider/Settings.java

@@ -3203,6 +3203,24 @@ public final class Settings {
         public static final String VENDING_CARRIER_PROVISIONING_REFRESH_FREQUENCY_MS =
                 "vending_carrier_ref_freq_ms";
 
+        /**
+         * Interval in milliseconds after which a failed provisioning request should be retried.
+         */
+        public static final String VENDING_CARRIER_PROVISIONING_RETRY_MS =
+            "vending_carrier_prov_retry_ms";
+
+        /**
+         * Buffer in milliseconds for carrier credentials to be considered valid.
+         */
+        public static final String VENDING_CARRIER_CREDENTIALS_BUFFER_MS =
+            "vending_carrier_cred_buf_ms";
+
+        /**
+         * Setting which states if German Direct Debit support should be enabled.
+         */
+        public static final String VENDING_GDD_ENABLE =
+            "vending_gdd_enable";
+
         /**
          * URL that points to the legal terms of service to display in Settings.
          * <p>