Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f887da authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

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

Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
parents 22e1e357 55936599

src/com/android/bluetooth/opp/BluetoothOppBatch.java

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import com.google.android.collect.Lists; 


public class BluetoothOppBatch {

    private static final String TAG = "BtOppBatch";

    private static final boolean D = Constants.DEBUG;

    private static final boolean V = Constants.VERBOSE;



    public int mId;

src/com/android/bluetooth/opp/BluetoothOppManager.java

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import java.util.ArrayList; 
 */

public class BluetoothOppManager {

    private static final String TAG = "BluetoothOppManager";

    private static final boolean D = Constants.DEBUG;

    private static final boolean V = Constants.VERBOSE;



    private static BluetoothOppManager INSTANCE;

src/com/android/bluetooth/opp/BluetoothOppNotification.java

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import java.util.HashMap; 
 */

class BluetoothOppNotification {

    private static final String TAG = "BluetoothOppNotification";

    private static final boolean D = Constants.DEBUG;

    private static final boolean V = Constants.VERBOSE;



    static final String status = "(" + BluetoothShare.STATUS + " == '192'" + ")";

src/com/android/bluetooth/opp/BluetoothOppPreference.java

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.util.Log; 
 */

public class BluetoothOppPreference {

    private static final String TAG = "BluetoothOppPreference";

    private static final boolean D = Constants.DEBUG;

    private static final boolean V = Constants.VERBOSE;



    private static BluetoothOppPreference INSTANCE;

src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import android.widget.Toast; 
 */

public class BluetoothOppReceiver extends BroadcastReceiver {

    private static final String TAG = "BluetoothOppReceiver";

    private static final boolean D = Constants.DEBUG;

    private static final boolean V = Constants.VERBOSE;



    @Override