Hugo Benichi 01432b306d resolve merge conflicts of 9355bce0c3 to master ...

Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b

2017-02-17 10:47:58 +09:00

..

tethering

Verify duplicate upstream notifications are ignored

2017-02-14 15:55:57 +09:00

IpConnectivityEventBuilderTest.java

IpConnectivity metrics: add version number

2017-01-26 18:51:18 +09:00

IpConnectivityMetricsTest.java

IpConnectivityMetrics reads buffer size in settings

2017-01-26 18:51:30 +09:00

LingerMonitorTest.java

frameworks-test: adding missing @SmallTest

2017-01-26 18:52:45 +09:00

MetricsTestUtil.java

Move the connectivity tests to frameworks/base/tests/net.

2017-01-26 18:50:59 +09:00

NetdEventListenerServiceTest.java

frameworks-test: adding missing @SmallTest

2017-01-26 18:52:45 +09:00

NetworkNotificationManagerTest.java

DO NOT MERGE Unit tests for NetworkNotificationManager

2017-01-20 15:08:38 +09:00

TetheringTest.java

Move the connectivity tests to frameworks/base/tests/net.

2017-01-26 18:50:59 +09:00

VpnTest.java

Show notification for always-on app VPN

2017-01-26 18:52:35 +09:00