Xin Li 7ecf2cf1a7 [automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -s ours am: 6524622d0f -s ours ...

am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f023fd4fe72b6254cf51af02ca8bd5967e49549

2021-03-03 23:37:15 +00:00

core

Merge "Adding additional docs for OemNetworkPreferences"

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

framework

APIs for 5G slicing

2021-03-03 14:16:21 +09: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 "APIs for 5G slicing"

2021-03-03 18:42:20 +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%