tree 0314b93c0f69ae613944b5e5ca4df9908f1217ad
parent caaf16916828b4cd13549044a8ed57a219414616
parent 1c07fd511df873d9c4b6dcd066529959f7809ff6
author Jean-Baptiste Queru <jbq@google.com> 1282756694 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282756694 -0700

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"