am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo

Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp

* commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
  Make the default backup configuration "disabled; local transport selected"