Lorenzo Colitti 87ce7654bf Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233 am: 90cf1ed3f7 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie296e709b883fc2930b83dffbfb1366dd4a7e7e7

2021-02-05 09:55:17 +00:00

..

common

[FUI04] Refactor VpnInfo

2021-01-29 17:44:32 +08:00

integration

Fix FrameworksNetIntegrationTests failure

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

java

Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233 am: 90cf1ed3f7

2021-02-05 09:55:17 +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