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

Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread

* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
  Make the default backup configuration "disabled; local transport selected"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base