Lorenzo Colitti 164c79ced8 Merge "Fix merge conflict." am: 8e97e8b968 am: 5721650852 am: 7d15f97106 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96aaee4db38274c80ccc7797f66215c038cb5394

2021-02-18 07:52:04 +00:00

core

Use UserHandles instead of userId integers.

2021-02-16 08:06:23 +00:00

framework

Merge "Split parcelable .aidl files to aidl-export" into sc-dev

2021-02-18 01:16:10 +00:00

service

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08:00

services/core/java/com/android/server

Merge "Adding per-app default network callbacks support"

2021-02-17 04:47:51 +00:00

tests/net

Merge "Unit test automation for Per-App API functionality" am: eed1a0000b am: f0cfa51361 am: 0db660f54c

2021-02-17 19:45:57 +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%