Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp * commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05': Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp * commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05': Modify vCard exporter code so that it does not emit non-Ascii type.