Merge change I8490c0ec into eclair

* changes:
  com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT