resolved conflicts for merge of 55936599 to stage-korg-master

Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8

diff --cc src/com/android/bluetooth/opp/BluetoothOppManager.java
Simple merge

diff --cc src/com/android/bluetooth/opp/BluetoothOppNotification.java
Simple merge

diff --cc src/com/android/bluetooth/opp/BluetoothOppPreference.java
Simple merge

diff --cc src/com/android/bluetooth/opp/BluetoothOppService.java
index d5edc89,02bc5d5..82a90ca
--- 1/src/com/android/bluetooth/opp/BluetoothOppService.java
--- 2/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@@ -37,10 -37,7 +37,8 @@@ import javax.obex.ObexTransport
  
  import android.app.Service;
  import android.bluetooth.BluetoothAdapter;
- import android.bluetooth.BluetoothDevice;
  import android.content.BroadcastReceiver;
- import android.content.ContentUris;
 +import android.content.ContentResolver;
  import android.content.ContentValues;
  import android.content.Context;
  import android.content.Intent;

diff --cc src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
Simple merge

diff --cc src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
Simple merge