tree 1d793a39bd5c1e53cb7e9de38e2ede3898697375
parent 3003f30ddee0cb2f73d894a19bc1449fbe7cd601
parent eb114de5037bba89333bd7d57d305ae989727096
author Daisuke Miyakawa <dmiyakawa@google.com> 1258669091 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258669091 -0800

am eb114de5: Merge change I639b0f03 into eclair-mr2

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

* commit 'eb114de5037bba89333bd7d57d305ae989727096':
  Make vCard exporter append neighborhood to locality field instead of extended address,