am 26c91fa6: Merge change I4ff96000 into eclair-mr2

Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp

* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
  new gservices flag for delaying bad gmail operations

core/java/android/provider/Settings.java

@@ -2839,6 +2839,11 @@ public final class Settings {
         public static final String GMAIL_WAIT_TIME_RETRY_UPHILL_OP =
                 "gmail_wait_time_retry_uphill_op";
 
+        /**
+         * Controls if Gmail should delay sending operations that have previously failed.
+         */
+        public static final String GMAIL_DELAY_BAD_OP = "gmail_delay_bad_op";
+
         /**
          * Controls if the protocol buffer version of the protocol will use a multipart request for
          * attachment uploads. Value must be an integer where non-zero means true. Defaults to 0.