Merge commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499' into eclair-mr2-plus-aosp * commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499': Move verification code to VCardTestsBase.
Merge commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499' into eclair-mr2-plus-aosp * commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499': Move verification code to VCardTestsBase.