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