tree fceca393b27432000723509d4181660c5843eebd
parent 3982b478f8f1f1fbf455ec15e2462e1cca3b5488
parent a1b02556d0073119a24040704c0096160be69f4d
author Mike Cleron <mcleron@google.com> 1256947835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256947835 -0700

am a1b02556: Merge change I3134655d into eclair

Merge commit 'a1b02556d0073119a24040704c0096160be69f4d' into eclair-mr2

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