Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp * commit '6a942dbe51b52ce41903e236d5db294274bb0dd2': Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp * commit '6a942dbe51b52ce41903e236d5db294274bb0dd2': Make vCard code refrain from using NEIGHBORHOOD field when importing.