commit | 4799c095965602674f91a2039997422e1d1e441d | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 25 10:20:08 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 25 10:20:08 2010 -0700 |
tree | 3d7a6ea3e640e88684325b18b52731badb53d295 | |
parent | fcf39c0533d91e62aa2009b6c45906cdba44d15e [diff] | |
parent | 19e9ecc8a292d4c2f7b4ba03a685452500e392e3 [diff] |
am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant Merge commit '44b31fdd86053945e1eeb3b91783577aebd95b55' * commit '44b31fdd86053945e1eeb3b91783577aebd95b55': Make the default backup configuration "disabled; local transport selected"