Treehugger Robot 5d51200334 Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc am: 639ccdbd96 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e

2021-03-04 14:51:09 +00:00

..

common

[CS05]Remove the hidden API usage of MetricsLogger

2021-03-03 10:17:52 +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 changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc am: 639ccdbd96

2021-03-04 14:51:09 +00:00

jni

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

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

Address comments on aosp/1448415

2020-10-21 13:54:02 +09:00

OWNERS

…

TEST_MAPPING

Add imports to networking test mapping

2020-10-15 09:16:40 +00:00