Matthew Xie b50619cc14 am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev ...

* commit 'c0c7cebe3f5da99aeb48eb62bffbaf3183814194':
  Donot bind to GATT service when BLE is not supported

2013-05-09 16:28:30 -07:00

..

java

am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev

2013-05-09 16:28:30 -07:00

jni

Merge "Cleanup some of the thread merging."

2013-05-09 22:30:30 +00:00

res

Import translations. DO NOT MERGE

2013-05-08 08:31:18 -07:00

tests

am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev

2013-05-08 15:21:12 -07:00