am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import

Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp

* commit '5a016488da5ff6c1ecdff0b1febd836cc1711531':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code