Robert Greenwalt a17f45fa3d resolved conflicts for merge of ee6dfc50 to master am: 24118e8a28 ...

Original change: undetermined

Change-Id: I82c963b0f910363940730f161dcd62effebc978b

2021-05-31 03:49:29 +00:00

core

resolved conflicts for merge of ee6dfc50 to master

2010-09-09 13:15:32 -07:00

framework

Merge "Use updated NetworkEventDispatcher API" into sc-dev

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

service

Update allowed on restricted networks getter/setter

2021-05-26 16:16:57 +08:00

services/java/com/android/server

resolved conflicts for merge of ee6dfc50 to master

2010-09-09 13:15:32 -07:00

tests

Update allowed on restricted networks getter/setter

2021-05-26 16:16:57 +08:00

Tethering

Include sdk versioning proto in tethering apex

2021-05-25 13:01:31 +01:00

.gitignore

Add a .gitignore in packages/modules/Connectivity.

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

OWNERS

add maze to OWNERS

2021-01-19 18:31:52 -08: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

2021-05-24 04:40:14 +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%