Jakub Pawlowski 9f341e4e49 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a ...

am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c

2016-08-31 18:21:00 +00:00

..

java

Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a

2016-08-31 18:21:00 +00:00

jni

Fix google-explicit-constructor warnings in core/jni.

2016-08-29 14:46:35 -07:00

res

DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"

2016-08-29 20:22:08 -07:00

tests

Reenable the unit tests for StateMachine

2016-08-29 11:26:51 -07:00