Erik Kline dbc7279e85 resolve merge conflicts of b1eb85c9a8 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.

Merged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545
Merged-In: I717fdd269b012f32548ebe0603999ae403b03100
Merged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Merged-In: Ie32f50ec1a07e3126a05abee27c76bc63cdaca14
Change-Id: I217d7ca2958f3d6ca8992f738a034693a0fac486

2017-07-05 16:48:19 +09:00

..

tethering

Pass all offload-exempt prefixes into OffloadController

2017-07-01 23:20:25 +09:00

IpConnectivityEventBuilderTest.java

Connectivity metrics: add transports to connect stats

2017-04-14 01:44:52 +00:00

IpConnectivityMetricsTest.java

Connectivity metrics: add transports to connect stats

2017-04-14 01:44:52 +00:00

LingerMonitorTest.java

frameworks-test: adding missing @SmallTest

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

MetricsTestUtil.java

Connectivity metrics: simplify ConnectivityMetricsEvent

2017-03-15 15:12:38 +09:00

NetdEventListenerServiceTest.java

Connectivity metrics: add transports to connect stats

2017-04-14 01:44:52 +00:00

NetworkNotificationManagerTest.java

Fix NetworkNotificationManagerTest

2017-05-18 11:08:31 +09:00

TetheringTest.java

resolve merge conflicts of b1eb85c9a8 to stage-aosp-master

2017-07-05 16:48:19 +09:00

VpnTest.java

Use Vpn rules (not firewall) for always-on VPN

2017-03-27 13:40:51 +01:00