am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant

Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp

* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
  Make the default backup configuration "disabled; local transport selected"
This commit is contained in:
Jean-Baptiste Queru
2010-08-25 10:18:14 -07:00
committed by Android Git Automerger

Diff Content Not Available