Jaikumar Ganesh 20c8f47330 resolved conflicts for merge of 0522f5e9 to master ...

Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2

2010-09-13 14:57:59 -07:00

..

AtCommandHandler.java

…

AtCommandResult.java

…

AtParser.java

…

BluetoothA2dp.java

…

BluetoothAdapter.java

Out Of Band API for Secure Simple Pairing.

2010-09-13 11:40:21 -07:00

BluetoothAssignedNumbers.java

…

BluetoothAudioGateway.java

…

BluetoothClass.java

Add Tethering class bit check.

2010-08-23 11:50:32 -07:00

BluetoothDevice.aidl

…

BluetoothDevice.java

Out Of Band API for Secure Simple Pairing.

2010-09-13 11:40:21 -07:00

BluetoothDevicePicker.java

bluetooth tethering

2010-08-18 15:07:50 -07:00

BluetoothDeviceProfileState.java

…

BluetoothHeadset.java

Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT

2010-08-26 16:03:40 -07:00

BluetoothInputDevice.java

…

BluetoothInputStream.java

…

BluetoothOutputStream.java

…

BluetoothPan.java

Decouple Tethering UI with registering of SDP records.

2010-09-02 14:34:40 -07:00

BluetoothPbap.java

…

BluetoothProfileState.java

…

BluetoothServerSocket.java

…

BluetoothSocket.java

…

BluetoothUuid.java

Add BNEP_SVC UUID for incoming tethering connections.

2010-08-23 18:32:03 -07:00

HeadsetBase.java

…

IBluetooth.aidl

resolved conflicts for merge of 0522f5e9 to master

2010-09-13 14:57:59 -07:00

IBluetoothA2dp.aidl

…

IBluetoothCallback.aidl

…

IBluetoothHeadset.aidl

…

IBluetoothPbap.aidl

…

package.html

…