Doug Zongker a353152105 resolved conflicts for merge of dd3eff7d to master am: 6e78d3fdc3 am: 284b7e6f2c ...

Original change: undetermined

Change-Id: I8709a572cc58022bb80054a757d1e1800634a92f

2021-05-31 10:51:26 +00:00

framework

Merge "Use updated NetworkEventDispatcher API" into sc-dev

2021-05-26 13:34:07 +00:00

service

Merge "Update allowed on restricted networks getter/setter" into sc-dev am: 962e174260

2021-05-26 12:38:13 +00:00

tests

Merge "Add owners block for migration" am: 2b579353e3 am: 190b1fdf4e

2021-05-27 04:47:22 +00:00

Tethering

Merge "Add owners block for migration" am: 2b579353e3 am: 190b1fdf4e

2021-05-27 04:47:22 +00:00

.gitignore

Add a .gitignore in packages/modules/Connectivity.

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

OWNERS

Add owners block for migration

2021-05-27 01:13:44 +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%