James Mattis c090ae6387 Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32 am: 68fad37f38 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c

2021-03-05 22:37:45 +00:00

..

common

Fix CaptivePortalTest before R

2021-03-04 10:45:02 +00:00

integration

[FUI19] Migrate ConnectivityService to use NetworkStatsManager

2021-03-03 20:01:51 +08:00

java

Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32 am: 68fad37f38

2021-03-05 22:37:45 +00:00

res/raw

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

2020-05-28 02:44:20 -07:00

smoketest

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +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