Lorenzo Colitti ec960a86ce Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21 am: 203c72f86c am: 910fb03907 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d15c00910467d51531a25c025efb491b446b6a4

2021-02-01 12:41:24 +00:00

core

Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21 am: 203c72f86c am: 910fb03907

2021-02-01 12:41:24 +00:00

framework

resolve merge conflicts of bff19645ef to sc-dev

2021-02-01 11:29:28 +00:00

service

Revert^2 "Move service-connectivity to the tethering APEX"

2021-01-08 01:23:36 +00:00

services/core/java/com/android/server

Merge changes Idcc9e32c,I58769bb7

2021-02-01 10:56:19 +00:00

tests/net

Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21 am: 203c72f86c am: 910fb03907

2021-02-01 12:41:24 +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%