Sarah Chin 2a2ac396fd [automerger skipped] Merge "APIs for 5G slicing" am: 564ab64fab am: 33315832c8 am: 2281c116ad -s ours ...

am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 a5e4fc1359 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78

2021-03-03 20:24:13 +00:00

core

Merge "Adding additional docs for OemNetworkPreferences"

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

framework

Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62 am: 405b9a0f54

2021-03-02 21:09:58 +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 changes Idfb5e149,Ia52b24c5

2021-03-03 05:35:28 +00:00

tests/net

Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3 am: 132b0dcbad

2021-03-03 13:29:45 +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%