Treehugger Robot b19d0ca85d Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5 am: 0cc2e20cc9 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7c2c6289bcc469f43f0293ca4bfd7d6b15ce80a

2021-01-19 05:46:03 +00:00

..

common

Merge "Fix CaptivePortalDataTest on R-"

2021-01-15 05:26:34 +00:00

integration

Remove unused IpConnectivityMetrics in CS

2021-01-18 04:03:32 +00:00

java

Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 4fcb0e54a1 am: ed9f5d54a5 am: 0cc2e20cc9

2021-01-19 05:46:03 +00:00

res/raw

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

2020-05-28 02:44:20 -07:00

smoketest

Correct FrameworksNetTests-jni-defaults lib

2019-07-01 09:29:13 +00:00

Android.bp

Revert^2 "Move service-connectivity to the tethering APEX"

2021-01-08 01:23:36 +00:00

jarjar-rules.txt

Address comments on aosp/1448415

2020-10-21 13:54:02 +09:00

TEST_MAPPING

Add imports to networking test mapping

2020-10-15 09:16:40 +00:00