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

am: 8348bd2317

Change-Id: I15b6c8ab87822e5f33bdfabcb8e09e8ce9501cd7

2016-09-01 01:27:03 +00:00

..

java

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

2016-09-01 01:27:03 +00:00

jni

resolve merge conflicts of a2c1196 to master - continued

2016-08-31 18:09:00 -07:00

res

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

2016-08-31 16:15:37 -07:00

tests

DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp

2016-08-29 17:46:44 -07:00