| commit | 9650f128b24ae339fedd697ef6525cda8c42ebd2 | [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 | dd99783e67867287be900ca84c45bb91e8ea74b1 | |
| parent | 4200058044afd9ed0ee63b48c433fe83fda4279b [diff] | |
| parent | 44b31fdd86053945e1eeb3b91783577aebd95b55 [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"