| commit | 1c07fd511df873d9c4b6dcd066529959f7809ff6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 25 10:15:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 25 10:15:38 2010 -0700 |
| tree | 8844bd39ddf6611d60803a015b1861fb8faf0e2b | |
| parent | fd30cf4f967fba0fad84ced287c2769617f7efec [diff] | |
| parent | c1ee89ac9c8884e1f44f15545a7ac0c31f0aa359 [diff] |
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"