Merge change I647ae75e into eclair-mr2

* changes:
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.

core/java/android/provider/Settings.java

@@ -3097,6 +3097,13 @@ public final class Settings {
         public static final String GOOGLE_LOGIN_GENERIC_AUTH_SERVICE
                 = "google_login_generic_auth_service";
 
+        /**
+         * Duration in milliseconds after setup at which market does not reconcile applications
+         * which are installed during restore.
+         */
+        public static final String VENDING_RESTORE_WINDOW_MS = "vending_restore_window_ms";
+
+
         /**
          * Frequency in milliseconds at which we should sync the locally installed Vending Machine
          * content with the server.