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

Merge commit '09f0ab0454ee59170025337b786dd7cf8837d2ed' into froyo-plus-aosp

* commit '09f0ab0454ee59170025337b786dd7cf8837d2ed':
  Fix NPE in SyncManager