James Mattis f0cf0850fa Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464 am: 7a22adb443 am: c176f8d290 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8d45a68283ab29f6928628ebf852143793aff76

2020-12-22 06:57:02 +00:00

..

common

Add TcpKeepalivePacketData to SystemApi am: 11511b31f6

2020-12-15 09:38:38 +00:00

integration

Migrate NetworkAgentWrapper to the new NA API

2020-12-08 19:43:10 +09:00

java

Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464 am: 7a22adb443 am: c176f8d290

2020-12-22 06:57:02 +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

Merge "Address comments on aosp/1448415"

2020-10-21 07:05:49 +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