Robert Greenwalt 59a5d74448 resolved conflicts for merge of 377cf20b to master am: 49f762eeee am: 921f81f397 am: 3f82081a1f ...

Original change: undetermined

Change-Id: I7b0faeccf3a1e6b88c6c4f7385d90a574a093111

2021-05-31 12:21:25 +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 am: ce1dc4feb1

2021-05-26 12:53:16 +00:00

tests

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

2021-05-27 05:12:13 +00:00

Tethering

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

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