diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 14:04:34 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 14:04:34 -0800 |
| commit | e7f887dab2591a46ecf80616e00f33bb5d847935 (patch) | |
| tree | 9b83ab9264fd0c960eba8ca69a6a25881e92885e /src/com/android/bluetooth/opp/BluetoothOppManager.java | |
| parent | 22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8 (diff) | |
| parent | 55936599e88a156fb132a68c2e93d77fdd4e8a2e (diff) | |
| download | android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.tar.gz android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.tar.bz2 android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.zip | |
resolved conflicts for merge of 55936599 to stage-korg-master
Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppManager.java')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index e3a2b01be..01bc9d4ba 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppManager.java +++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java @@ -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; |