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

am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e

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

core/java

Merge "Remove NATT keepalive from IpSecTransform"

2020-12-04 02:07:56 +00:00

services

[Mainline Migration] Migrate NetworkUtils

2020-12-06 22:33:04 -08:00

wifi/java/android/net/wifi/p2p

[P2P] Add binder to service calls

2017-06-06 17:23:44 +00: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%