Jakub Pawlowski 1366a9a4fb resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 am: 84b61fb4b0 ...

am: ecd10beefd

Change-Id: I4d72144cfd66a51fe8e2aaaf93ed4c4981830d3b

2016-08-11 23:17:53 +00:00

..

le

…

BluetoothA2dp.java

Guard concurrent accesses to BluetoothA2dp service object

2016-06-22 01:08:03 +00:00

BluetoothA2dpSink.java

…

BluetoothActivityEnergyInfo.aidl

…

BluetoothActivityEnergyInfo.java

…

BluetoothAdapter.java

Add Bluetooth toggle prompts - framework

2016-07-22 20:40:35 -07:00

BluetoothAssignedNumbers.java

…

BluetoothAudioConfig.aidl

…

BluetoothAudioConfig.java

…

BluetoothAvrcp.java

…

BluetoothAvrcpController.java

…

BluetoothAvrcpPlayerSettings.aidl

…

BluetoothAvrcpPlayerSettings.java

…

BluetoothClass.java

…

BluetoothDevice.aidl

…

BluetoothDevice.java

Fix links to Bluetooth Guide

2016-06-20 10:26:31 -07:00

BluetoothDevicePicker.java

…

BluetoothGatt.java

Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf am: 0aa5797976 am: ed042c00e0

2016-08-04 00:34:12 +00:00

BluetoothGattCallback.java

…

BluetoothGattCallbackWrapper.java

…

BluetoothGattCharacteristic.aidl

…

BluetoothGattCharacteristic.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothGattDescriptor.aidl

…

BluetoothGattDescriptor.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothGattIncludedService.aidl

…

BluetoothGattIncludedService.java

…

BluetoothGattServer.java

Fix bad index usage

2016-08-04 20:19:52 +00:00

BluetoothGattServerCallback.java

…

BluetoothGattService.aidl

…

BluetoothGattService.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothHeadset.java

HFP 1.7 profile update (3/4)

2016-08-03 17:55:04 -07:00

BluetoothHeadsetClient.java

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

BluetoothHeadsetClientCall.aidl

…

BluetoothHeadsetClientCall.java

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

BluetoothHealth.java

…

BluetoothHealthAppConfiguration.aidl

…

BluetoothHealthAppConfiguration.java

…

BluetoothHealthCallback.java

…

BluetoothInputDevice.java

…

BluetoothInputStream.java

…

BluetoothManager.java

…

BluetoothMap.java

…

BluetoothMasInstance.java

…

BluetoothOutputStream.java

…

BluetoothPan.java

…

BluetoothPbap.java

…

BluetoothPbapClient.java

…

BluetoothProfile.java

…

BluetoothSap.java

Correct typo in BluetoothSap binder

2016-06-16 21:02:39 +00:00

BluetoothServerSocket.java

Fix links to Bluetooth Guide

2016-06-20 10:26:31 -07:00

BluetoothSocket.java

Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d

2016-06-21 23:40:28 +00:00

BluetoothUuid.java

…

IBluetooth.aidl

…

IBluetoothA2dp.aidl

…

IBluetoothA2dpSink.aidl

…

IBluetoothAvrcpController.aidl

…

IBluetoothCallback.aidl

…

IBluetoothGatt.aidl

Merge "Remove write type from GATT descriptor writes (1/4)"

2016-08-04 00:01:25 +00:00

IBluetoothGattCallback.aidl

…

IBluetoothGattServerCallback.aidl

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

IBluetoothHeadset.aidl

HFP 1.7 profile update (3/4)

2016-08-03 17:55:04 -07:00

IBluetoothHeadsetClient.aidl

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

IBluetoothHeadsetPhone.aidl

…

IBluetoothHealth.aidl

…

IBluetoothHealthCallback.aidl

…

IBluetoothInputDevice.aidl

…

IBluetoothManager.aidl

Add Bluetooth toggle prompts - framework

2016-07-22 20:40:35 -07:00

IBluetoothManagerCallback.aidl

…

IBluetoothMap.aidl

…

IBluetoothPan.aidl

…

IBluetoothPbap.aidl

…

IBluetoothPbapClient.aidl

…

IBluetoothProfileServiceConnection.aidl

…

IBluetoothSap.aidl

…

IBluetoothStateChangeCallback.aidl

…

OobData.aidl

…

OobData.java

resolve merge conflicts of 5671277 to stage-aosp-master

2016-08-11 15:53:06 -07:00

package.html

…

SdpMasRecord.java

…

SdpMnsRecord.java

…

SdpOppOpsRecord.java

…

SdpPseRecord.java

…

SdpRecord.java

…

SdpSapsRecord.java

…

UidTraffic.java

…