am e68105c1: am c37018a7: am ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo

Merge commit 'e68105c113187ec25a2a0a82eb8afe4269920165'

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