diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
| commit | 980d40b568bf976eed8de7c035c2e30ddc67fa89 (patch) | |
| tree | bec0231a831ddc6f1303c871316c593d50c0bf39 /core/java/android/server/BluetoothEventLoop.java | |
| parent | 37ece16cdc87b33c022986a66ae1c4cc50e65936 (diff) | |
| parent | 738aadd70fb96491e34645e78241eeb04ee83460 (diff) | |
resolved conflicts for merge of 738aadd7 to master
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
Diffstat (limited to 'core/java/android/server/BluetoothEventLoop.java')
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index d2620d70d726..4edc01f7f848 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -39,7 +39,7 @@ import android.os.PowerManager; /** * TODO: Move this to * java/services/com/android/server/BluetoothEventLoop.java - * and make the contructor package private again. + * and make the constructor package private again. * * @hide */ @@ -754,7 +754,7 @@ class BluetoothEventLoop { private void onRestartRequired() { if (mBluetoothService.isEnabled()) { - Log.e(TAG, "*** A serious error occured (did bluetoothd crash?) - " + + Log.e(TAG, "*** A serious error occurred (did bluetoothd crash?) - " + "restarting Bluetooth ***"); mHandler.sendEmptyMessage(EVENT_RESTART_BLUETOOTH); } |