tree 3a4f9ec008fe41dc79c7a1507c52bcb382aa9098
parent 46a5604858cd35093b47da3ffdac471dd146f994
parent d335e2cdf34c9c1d641bd4697c08df4a8e07f9e3
author Romain Guy <romainguy@android.com> 1259814695 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259814695 -0800

am d335e2cd: am de3380f8: Merge change Icb5606e3 into eclair

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

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