Lorenzo Colitti 8e97e8b968 Merge "Fix merge conflict."

2021-02-18 05:22:56 +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 "Fix merge conflict."

2021-02-18 05:22:56 +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