James Mattis 645774646b Merge changes Iabad7300,I85363e28 am: d86b977679 am: e2fc895c34 am: 9febeffaf7 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05f6ae928a5bfa8b56837fa5c55803b2233d36a1

2021-02-06 06:07:15 +00:00

..

common

Update OemNetworkPreferences to use 1:1 Map

2021-02-04 20:12:40 -08:00

integration

Fix FrameworksNetIntegrationTests failure

2021-01-25 23:40:06 +08:00

java

Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c am: 4bec1c714d

2021-02-05 12:50:16 +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 "Specify version for aidl_interface explicitly"

2021-02-03 02:21:26 +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