am 02e18d4d: Merge "Make the default backup configuration "disabled; local...
am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '02e18d4d' into gingerbread
* commit '02e18d4d':
Make the default backup configuration "disabled; local transport selected"