tree e762b247f80fe68c56e120019cb6a2754230270c
parent 5ae171eb55bbc92d32c518524aafba4a8a6e67c0
parent 241b5c70a261658ee022cc55d03d638501f72e29
author Romain Guy <romainguy@android.com> 1259865941 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259865941 -0800

am 241b5c70: am d335e2cd: am de3380f8: Merge change Icb5606e3 into eclair

Merge commit '241b5c70a261658ee022cc55d03d638501f72e29'

* commit '241b5c70a261658ee022cc55d03d638501f72e29':
  Upgrade Home db to upgrade contacts shortcut to the quick contact action