Lorenzo Colitti 3d397dbd72 Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4 am: 263ead791b am: 8f5de657a6 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44e26cb8d6e8071c7467316bfb60047d1ea10a22

2021-02-19 09:40:14 +00:00

..

common

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08:00

integration

Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

2021-02-12 04:09:15 +00:00

java

Merge changes I0e6df469,I3d46d5f7 am: 05baf850c4 am: 263ead791b am: 8f5de657a6

2021-02-19 09:40:14 +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-16 04:09:57 -08:00

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08: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