am 29fd635b: am 7159b406: reconcile froyo-release into gingerbread

Merge commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a'

* commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a':
  Explicitly enable backup by default in SDK builds