tree fceca393b27432000723509d4181660c5843eebd
parent 9275a2ddbcec406c28ce11ef6093727f9b6e19f6
parent cb44b4d475500b4a2ced729ae64d6d87f46f09b7
author Mike Cleron <mcleron@google.com> 1256948296 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256948296 -0700

am cb44b4d4: am a1b02556: Merge change I3134655d into eclair

Merge commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7' into eclair-mr2-plus-aosp

* commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7':
  More capabilities for default home configuration