dimitry bb9855d08e resolve merge conflicts of a2640b6f51 to pi-dev-plus-aosp ...

Test: n/a
Change-Id: I3b91125b1a715690c2cd417b1e937e568c755d9f

2018-03-27 17:57:59 +02:00

..

connectivity

resolve merge conflicts of a2640b6f51 to pi-dev-plus-aosp

2018-03-27 17:57:59 +02:00

net

Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12

2018-03-23 04:01:09 +00:00

ConnectivityServiceTest.java

Merge "Pass all relevant resolver info to netd" am: 76f64641bb

2018-03-24 01:16:37 +00:00

IpSecServiceParameterizedTest.java

Check mOwnedByTransform to avoid DELSA on SPI

2018-03-20 18:29:02 -07:00

IpSecServiceRefcountedResourceTest.java

Add reference counted resources to IpSecService

2017-12-12 23:40:52 -08:00

IpSecServiceTest.java

Add TunnelInterface API and KernelResourceRecords

2018-01-24 07:24:27 +00:00

NetworkManagementServiceTest.java

Prevent crash in NetworkManagementServiceTest#shutdown()

2018-01-29 16:01:56 +09:00

NsdServiceTest.java

…