Xin Li b3fd6fcb66 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -s ours am: 6fe90d9859 -s ours am: 01e7f22043 -s ours ...

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id78860e6761ba4c4954c02508f16ae975e1fb161

2020-12-10 03:59:00 +00:00

core/java

Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f am: 1453310967 am: 702c455bae

2020-12-04 05:14:46 +00:00

services

Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: 6f3c1295e9 am: fd6dd089a8

2020-12-10 01:05:32 +00:00

wifi/java/android/net/wifi/p2p

WifiP2pManager: Plumb package name to service

2020-08-12 06:39:30 -07: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%