diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 13:44:05 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 13:44:05 -0700 |
| commit | 5c0d6f61ab8d75bf55a33aa65c36fde1b3b4469d (patch) | |
| tree | 20f59cdd8f03a512dca60771d35629417e082926 /services | |
| parent | 21125b81c962e01b5c5e6ba1959fbe0bd37681bf (diff) | |
| parent | 6ddbb5e55f72e870899731ff12af9945fa970e6e (diff) | |
| download | frameworks_base-5c0d6f61ab8d75bf55a33aa65c36fde1b3b4469d.zip frameworks_base-5c0d6f61ab8d75bf55a33aa65c36fde1b3b4469d.tar.gz frameworks_base-5c0d6f61ab8d75bf55a33aa65c36fde1b3b4469d.tar.bz2 | |
Merge commit '6ddbb5e' into merge2
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/BluetoothManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 3e5eee8..ef82bb7 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -56,6 +56,7 @@ import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; +import java.util.*; class BluetoothManagerService extends IBluetoothManager.Stub { private static final String TAG = "BluetoothManagerService"; private static final boolean DBG = true; |