am 79ace451: am 09f0ab04: Merge "Fix NPE in SyncManager" into froyo

Merge commit '79ace45187236afc736c60bc0a0e70f284bce36b' into kraken

* commit '79ace45187236afc736c60bc0a0e70f284bce36b':
  Fix NPE in SyncManager