am d5e601c2: reconcile open-source froyo into google variant
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread * commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9': Make the default backup configuration "disabled; local transport selected"
This commit is contained in:
committed by
Android Git Automerger
commit
7e2f87fafa