tree fceca393b27432000723509d4181660c5843eebd
parent 9aa0901abffa1cfbecdf4f9cfb15fce1db315460
parent 7dba1856d92c9b4c34776dc8ceab8af4c9bae8b8
author Mike Cleron <mcleron@google.com> 1257141361 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257141361 -0800

am 7dba1856: am cb44b4d4: am a1b02556: Merge change I3134655d into eclair

Merge commit '7dba1856d92c9b4c34776dc8ceab8af4c9bae8b8'

* commit '7dba1856d92c9b4c34776dc8ceab8af4c9bae8b8':
  More capabilities for default home configuration