Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp * commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5': Add a test for vCard composer.
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp * commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5': Add a test for vCard composer.