tree 3a4f9ec008fe41dc79c7a1507c52bcb382aa9098
parent 558a3c412922726416bdb4430d2079da4a390688
parent de3380f8749cd7893a770308d9bfb9a64b9e4938
author Romain Guy <romainguy@android.com> 1259814465 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259814465 -0800

am de3380f8: Merge change Icb5606e3 into eclair

Merge commit 'de3380f8749cd7893a770308d9bfb9a64b9e4938' into eclair-mr2

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