feef7de25b
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp * commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb': Split vCard composer into two parts: VCardComposer and VCardBuilder.