Merge commit '0cda59112526c03f3b8be0eb885926b7515df756' into eclair-mr2-plus-aosp * commit '0cda59112526c03f3b8be0eb885926b7515df756': Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.