Merge change I66693ea2 into eclair

* changes:
  fix sync exponential backoff for expedited syncs

core/java/android/content/SyncManager.java

@@ -811,7 +811,7 @@ class SyncManager implements OnAccountsUpdateListener {
     private long rescheduleWithDelay(SyncOperation syncOperation) {
         long newDelayInMs;
 
-        if (syncOperation.delay == 0) {
+        if (syncOperation.delay <= 0) {
             // The initial delay is the jitterized INITIAL_SYNC_RETRY_TIME_IN_MS
             newDelayInMs = jitterize(INITIAL_SYNC_RETRY_TIME_IN_MS,
                     (long)(INITIAL_SYNC_RETRY_TIME_IN_MS * 1.1));