James Mattis e8bae87a06 Merge changes from topics "pans", "pans-permission" am: 68658a18c7 am: 6e19867390 am: c4221b6a75 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267

2021-02-14 09:51:16 +00:00

..

common

Marking setOemNetworkPreference as @SystemApi

2021-02-11 20:38:21 -08:00

integration

[VCN07] Bypass VCN for non-internet app accessible cellular services

2021-02-04 17:07:23 +08:00

java

Merge changes Ifc8ad902,I6d1b8d0e am: 87c6253518 am: 66b74e588b am: 913569d3e5

2021-02-12 22:46:32 +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