Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp * commit '5a016488da5ff6c1ecdff0b1febd836cc1711531': Develop ContentResolver-based unit tests for vCard importer and fix vCard code
Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp * commit '5a016488da5ff6c1ecdff0b1febd836cc1711531': Develop ContentResolver-based unit tests for vCard importer and fix vCard code