Kurt Marcinkiewicz 98be440cfc Merge "Allow specifying a network for SNTP time sync" into pi-dev ...

am: 991b971acb

Change-Id: I339c77063c72a9d76a5c4cb17052e20fb6e045a6

2018-03-23 19:40:39 +00:00

..

java

Merge "Allow specifying a network for SNTP time sync" into pi-dev

2018-03-23 19:40:39 +00:00

jni

Merge "detect api version, and start respecting offsets" into pi-dev

2018-03-23 11:25:19 +00:00

proto

Add new key from Settings.java to settings.proto.

2018-03-23 11:15:37 +00:00

res

Merge "Add multisim notifications for SST" into pi-dev

2018-03-23 09:42:40 +00:00

tests

Merge "Allow specifying a network for SNTP time sync" into pi-dev

2018-03-23 19:40:39 +00:00