am 8d53a13d: Merge "Add a backup provider for the SDK" into froyo

Merge commit '8d53a13daf1756dca86ddea8519ac43334e824fe' into froyo-plus-aosp

* commit '8d53a13daf1756dca86ddea8519ac43334e824fe':
  Add a backup provider for the SDK