Dianne Hackborn efb4b4941d resolved conflicts for merge of 93aca85e to master am: 3f5a9b046d ...

Original change: undetermined

Change-Id: I8017e92f159dd82e59b0f0f5bcdc4ac7cda07638

2021-05-31 10:49:19 +00:00

core

use hostname when address null ProxyProperties parcelling

2010-09-27 12:16:11 -07:00

framework

Merge history of packages/Connectivity

2021-05-24 05:45:18 +00:00

service

Merge history of packages/Connectivity

2021-05-24 05:45:18 +00:00

services/java/com/android/server

resolved conflicts for merge of 93aca85e to master

2010-09-30 20:34:34 -07:00

tests

Merge "Add owners block for migration"

2021-05-27 03:38:59 +00:00

Tethering

Merge "Include sdk versioning proto in tethering apex"

2021-05-27 10:05: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

2021-05-24 05:45:18 +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%