Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp * commit '8b12144dad94bc0807e20590d72b4aadc56189d4': Add tests and fix vCard code.
Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp * commit '8b12144dad94bc0807e20590d72b4aadc56189d4': Add tests and fix vCard code.