nharold 461aeb4689 Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 ...

am: bbb4b05a64

Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5

2018-01-25 07:49:59 +00:00

..

java

Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4

2018-01-25 07:49:59 +00:00

jni

Merge changes from topic "bpfStats" am: 6e03224697

2018-01-24 05:39:54 +00:00

proto/android

Add the defaultNetwork element to the netstats.proto.

2018-01-23 18:38:48 +09:00

res

Merge "Make LTE signal bar thresholds customizable with carrier configuration" am: 8fb3bdc36f

2018-01-19 21:36:06 +00:00

tests

Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46

2018-01-24 23:34:38 +00:00