am 406ed04d: Merge "Backup/Restore sample application" into froyo

Merge commit '406ed04d5a6b37dd9ed439ea954a1f23ac675138' into froyo-plus-aosp

* commit '406ed04d5a6b37dd9ed439ea954a1f23ac675138':
  Backup/Restore sample application