am d8de2ba4: Merge change 5750 into donut

Merge commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a'

* commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a':
  Add a new checkin server flag for Vending Machine client server ping frequency for pending downloads.

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 303d3fc5c3c6..7e10023f44df 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2871,6 +2871,13 @@ public final class Settings {
                 "vending_heartbeat_frequency_ms";
 
         /**
+         * Frequency in milliseconds at which we should resend pending download
+         * requests to the API Server from the Vending Machine client.
+         */
+        public static final String VENDING_PENDING_DOWNLOAD_RESEND_FREQUENCY_MS =
+                "vending_pending_download_resend_frequency_ms";
+
+        /**
          * URL that points to the legal terms of service to display in Settings.
          * <p>
          * This should be a https URL. For a pretty user-friendly URL, use