Revert "ContactsContract: Adding joined columns to the Data class definition."

     * definition and some generic columns. Each data type can define the meaning for each of

     * the generic columns.

     */

    public static final class Data implements BaseColumns, DataColumns, RawContactsColumns,

            ContactsColumns, SyncColumns {

    public static final class Data implements BaseColumns, DataColumns {

        /**

         * This utility class cannot be instantiated

         */

import android.net.Uri;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.FastTrack;

import android.provider.ContactsContract.Data;

import android.provider.ContactsContract.Intents;

import android.provider.ContactsContract.PhoneLookup;

import android.provider.ContactsContract.RawContacts;

import android.provider.ContactsContract.CommonDataKinds.Email;

import android.util.AttributeSet;

import android.view.View;

    static final private int TOKEN_PHONE_LOOKUP_AND_TRIGGER = 3;

    static final String[] EMAIL_LOOKUP_PROJECTION = new String[] {

        Data.CONTACT_ID,

        RawContacts.CONTACT_ID,

        Contacts.LOOKUP_KEY,

    };

    static int EMAIL_ID_COLUMN_INDEX = 0;