Lorenzo Colitti a9549e4275 [automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours ...

am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 b4bf015b57 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383

Change-Id: I49a1191f13e16e8c4cbea74cff913f03453168bd

2021-06-14 06:03:47 +00:00

framework

Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev

2021-06-07 09:29:56 +00:00

service

Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a

2021-06-11 00:05:52 +00:00

tests

Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca

2021-06-13 16:52:06 +00:00

Tethering

Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f

2021-06-10 14:03:59 +00:00

.gitignore

Add a .gitignore in packages/modules/Connectivity.

2020-11-27 18:09:21 +09:00

OWNERS

Revert "Add owners block for migration"

2021-05-31 10:34:04 +00:00

PREUPLOAD.cfg

Add repo hooks for packages/modules/Connectivity.

2020-11-27 18:09:24 +09:00

TEST_MAPPING

Merge history of packages/Connectivity am: 2afd0986d3

2021-05-24 08:21:53 +00:00

Description

android_packages_modules_Connectivity

189 MiB

Languages

Java 81.4%

Kotlin 7.7%

AIDL 4.5%

C++ 4.5%

C 1.7%

Other 0.1%