resolve merge conflicts of 26e793bc to nyc-dev-plus-aosp

import java.io.IOException;

import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

import java.util.Set;

/**

 * A base implementation of the BluetoothMapEmailContract.

import android.content.pm.ProviderInfo;

import android.database.Cursor;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Binder;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.util.Log;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileOutputStream;

import java.io.IOException;

import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

* See the License for the specific language governing permissions and

* limitations under the License.

*/

package com.android.bluetooth;

import java.io.IOException;

package com.android.bluetooth;

import java.io.IOException;

import java.util.concurrent.CountDownLatch;

import javax.obex.ObexSession;

import javax.obex.ResponseCodes;

import javax.obex.ServerSession;

package com.android.bluetooth;

import java.io.UnsupportedEncodingException;

import com.android.bluetooth.map.BluetoothMapUtils;

import java.io.UnsupportedEncodingException;

/**

 * Class to represent a 128bit value using two long member variables.

 * Has functionality to convert to/from hex-strings.