Lorenzo Colitti 187a9a085a 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

deflake

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

integration

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

java

Merge "Fix merge conflict."

2021-02-18 05:22:56 +00:00

jni

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

AndroidManifest.xml

Adding permission for OEM managed preferences

2021-02-11 20:38:21 -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