Lorenzo Colitti 44ed78606a Merge changes Ifa2aa335,I09366a7f am: 708c77d236 am: 7c2b530a09 am: c810356573 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac2a510eb5837acd77b2d7884da0af14cca502f

2021-02-03 16:33:10 +00:00

..

common

[FUI04] Refactor VpnInfo

2021-01-29 17:44:32 +08:00

deflake

…

integration

Fix FrameworksNetIntegrationTests failure

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

java

Merge changes Ifa2aa335,I09366a7f am: 708c77d236 am: 7c2b530a09 am: c810356573

2021-02-03 16:33:10 +00:00

jni

…

res/raw

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

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

smoketest

…

Android.bp

Merge "Specify version for aidl_interface explicitly"

2021-02-03 02:21:26 +00:00

AndroidManifest.xml

Deprecate MANAGE_ACTIVITY_STACKS permission

2020-10-28 09:20:00 +08: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