Jaikumar Ganesh 6dd4531639 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp ...

Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85

2011-07-13 12:29:57 -07:00

..

AtCommandHandler.java

BluetoothHeadset.java:

2010-08-13 15:23:00 -07:00

AtCommandResult.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

AtParser.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

BluetoothA2dp.java

DO NOT MERGE Incoming Bluetooth Connection requests - dialog.

2011-06-21 09:27:12 -07:00

BluetoothAdapter.java

resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

2011-07-13 12:29:57 -07:00

BluetoothAssignedNumbers.java

Expose Vendor Specific Headset Event Intent.

2010-10-25 11:07:58 -07:00

BluetoothAudioGateway.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

BluetoothClass.java

Follow the spec recommendation for keyboard pairing.

2011-01-06 14:18:42 -08:00

BluetoothDevice.aidl

…

BluetoothDevice.java

DO NOT MERGE Incoming Bluetooth Connection requests - dialog.

2011-06-21 09:27:12 -07:00

BluetoothDevicePicker.java

resolved conflicts for merge of 738aadd7 to master

2010-09-30 19:33:43 -07:00

BluetoothDeviceProfileState.java

am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread

2011-06-21 13:24:46 -07:00

BluetoothHeadset.java

am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread

2011-06-21 13:24:46 -07:00

BluetoothInputDevice.java

Make BluetoothInputDevice inherit from BluetoothProfile.

2011-02-22 10:42:26 -08:00

BluetoothInputStream.java

…

BluetoothOutputStream.java

…

BluetoothPan.java

Make BluetoothPan inherit from BluetoothProfile.

2011-02-23 15:49:15 -08:00

BluetoothPbap.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

BluetoothProfile.java

Make BluetoothPan inherit from BluetoothProfile.

2011-02-23 15:49:15 -08:00

BluetoothProfileState.java

Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 14:55:10 -07:00

BluetoothServerSocket.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

BluetoothSocket.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

BluetoothTetheringDataTracker.java

Add external dependency API.

2011-04-07 12:28:37 -07:00

BluetoothUuid.java

Add direct calls to Bluez to add SDP records.

2010-12-13 11:37:41 -08:00

HeadsetBase.java

Typo fixes in comments and minor code cleanups.

2010-09-30 15:43:34 -07:00

IBluetooth.aidl

Make BluetoothPan inherit from BluetoothProfile.

2011-02-23 15:49:15 -08:00

IBluetoothA2dp.aidl

DO NOT MERGE Incoming Bluetooth Connection requests - dialog.

2011-06-21 09:27:12 -07:00

IBluetoothCallback.aidl

…

IBluetoothHeadset.aidl

DO NOT MERGE Incoming Bluetooth Connection requests - dialog.

2011-06-21 09:27:12 -07:00

IBluetoothPbap.aidl

…

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00