James Mattis c4b1e28957 Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976 am: a5e243419a ...

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

deflake

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

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

jni

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

res/raw

…

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

AndroidManifest.xml

Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: d11f866ee6 am: 6c16aeadfb

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

AndroidTest.xml

…

jarjar-rules.txt

…

OWNERS

…

TEST_MAPPING

…