Junyu Lai 8d06e8aba8 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d am: f76c711734 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide501fcf659637c0ec175d3f6f5926c2482734e0

2021-01-28 14:58:38 +00:00

..

common

Fix CaptivePortalDataTest#testParcelUnparcel on R

2021-01-19 02:33:09 +00:00

integration

Fix FrameworksNetIntegrationTests failure

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

java

Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d am: f76c711734

2021-01-28 14:58:38 +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