Hugo Benichi f467db29f9 Merge "Network Service Discovery test: properly release resources" am: c9d24d203d ...

am: 80e0daa870

Change-Id: I03c0cff6dfdcd8dfc94de8399161ceab0f7a901a

2017-09-04 12:25:10 +00:00

..

java

Merge "Network Service Discovery test: properly release resources" am: c9d24d203d

2017-09-04 12:25:10 +00:00

jni

Merge changes I49057737,I68e3096d

2017-08-31 15:15:31 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Fixed default values for Bluetooth energy calculations" am: 7c45962abd

2017-09-01 21:32:44 +00:00

tests

Merge changes I49057737,I68e3096d

2017-08-31 15:15:31 +00:00