Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -07:00

..

search

…

BluetoothA2dpService.java

…

BluetoothEventLoop.java

Add BNEP_SVC UUID for incoming tethering connections.

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

BluetoothService.java

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

package.html

…