tree b272d58bc93fe746981ff96145e3bdeef6ff0ed8
parent 2ffaf68b6b19da23258a0bed9eaeba0b1660e50e
parent 29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a
author Jean-Baptiste Queru <jbq@google.com> 1285548681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285548681 -0700

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

Merge commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a'

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