am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair

Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp

* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
  don't reschedule syncs that failed with a tooManyRetries error