Chalard Jean
2f8889613d
Resolve merge conflicts of aedd67b6cc to master ...
Test: this is the exact code these changes were meant to give
without conflict had the auto-merger not squashed them
together before it tried to merge them. It was tested on
master in this state.
Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a
2018-01-24 15:59:26 +09:00
Disable IpConnectivityMetricsTest.
2018-01-23 18:38:48 +09:00
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: 76715955e0 am: fd496bf6ad
2018-01-19 16:46:11 +00:00
Let network requests see VPNs.
2018-01-23 21:38:00 +09:00
Add checks to ensure SPIs are not reused
2018-01-22 21:09:47 -08:00
Add reference counted resources to IpSecService
2017-12-12 23:40:52 -08:00
Merge "Address comments and final cleanup from refcounting integration"
2018-01-22 20:32:18 +00:00
Make NetworkManagementServiceTest pass again.
2017-08-23 09:49:05 +09:00
Fix NPE in NsdServiceTest
2017-09-28 15:22:13 +09:00
2f8889613d