tree c26c73382be20bbd691132029d524d7687f4b038
parent efe676074b55867817c723e8232078810479906c
parent 6a942dbe51b52ce41903e236d5db294274bb0dd2
author Daisuke Miyakawa <dmiyakawa@google.com> 1258597584 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258597584 -0800

am 6a942dbe: Merge change Ifd754059 into eclair-mr2

Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp

* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.