am 4cb6fc7e: Merge change Icc48b1e7 into eclair

Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-plus-aosp

* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
  don't request a sync when temp providers are created