am 23eb8223: am 4f81eac4: Merge change I27b1bb90 into eclair-mr2

Merge commit '23eb822369952931935589a8b838929b4c044fba'

* commit '23eb822369952931935589a8b838929b4c044fba':
  Refactor vCard test code and modify unit tests.