Lucas Lin def33143e8 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev

2021-03-22 09:38:26 +00:00

..

common

resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master

2021-03-21 19:16:33 +00:00

integration

Merge changes from topic "replaceUidRange" into sc-dev

2021-03-19 10:32:30 +00:00

java

Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev

2021-03-22 09:38:26 +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

Merge "Create ServiceConnectivityResources"

2021-03-16 02:29:31 +00:00

jarjar-rules.txt

Address comments on aosp/1448415

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

TEST_MAPPING

frameworks: add test group for auto tests

2021-03-09 15:54:39 -08:00