AI 145124: am: CL 144928 Make the uphill discarding ops functionality controllable via a Gservices flag
  Original author: cynthiaw

Automated import of CL 145124
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d7d7c2e..3fb46ed 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2443,6 +2443,12 @@
         public static final String GMAIL_BUFFER_SERVER_RESPONSE = "gmail_buffer_server_response";
 
         /**
+         * Controls whether Gmail will discard uphill operations that repeatedly fail. Value must be
+         * an integer where non-zero means true. Defaults to 1.
+         */
+        public static final String GMAIL_DISCARD_ERROR_UPHILL_OP = "gmail_discard_error_uphill_op";
+
+        /**
          * Hostname of the GTalk server.
          */
         public static final String GTALK_SERVICE_HOSTNAME = "gtalk_hostname";