am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware...
am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'a7bb3ba5'
* commit 'a7bb3ba5':
Make vCard importer/exporter aware of multi-byte parameters.