Janis Danisevskis 2ed485da9d [automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d am: bb865ae949 -s ours ...

am skip reason: Change-Id I27975113896ea137260a9f94a34fb1c3ca173fe3 with SHA-1 42f77b882f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd42249b22890ef71ece31e70e7c9a61cdb50e1

2021-03-05 05:59:25 +00:00

core

Merge "Adding additional docs for OemNetworkPreferences"

2021-03-03 17:25:01 +00:00

framework

Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 6ef08c36a7 am: c5ed4d8124 am: e4bb3866d8

2021-03-04 05:08:28 +00:00

service

Add modules-utils-os to service-connectivity

2021-03-02 03:28:58 +00:00

services/core/java/com/android/server

Merge "Have the DataConnectionStat started from BSS" into sc-dev

2021-03-05 00:29:54 +00:00

tests/net

Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b am: 42b8c94fae

2021-03-05 05:22:29 +00:00

OWNERS

Add OWNERS for packages/Connectivity

2020-12-14 18:34:39 +09: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%