Merge commit '35de7ef84380975a229d5b984b63da23871738db' into eclair-plus-aosp * commit '35de7ef84380975a229d5b984b63da23871738db': FastTrack->QuickContact
Merge commit '35de7ef84380975a229d5b984b63da23871738db' into eclair-plus-aosp * commit '35de7ef84380975a229d5b984b63da23871738db': FastTrack->QuickContact