Jaikumar Ganesh 830d8c5fb3 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" ...

* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server

2011-06-06 12:56:55 -07:00

..

java

am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"

2011-06-06 12:56:55 -07:00

jni

Remove dead code related to gettid

2011-06-03 16:12:37 -07:00

res

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

tests

Bluetooth: correcting return value from cancelDiscovery

2011-06-02 10:30:49 -07:00