Anton Hansson 59c16d911b Merge mainline-prod into master ...

$ git merge -s ours origin/mainline-prod

There are only two commits not from upstream:
05cdb9972ac11770ab155b8b8e7fe61fcc168011
1be2664406a2e697044f483a44c547973f915e3d

But both of these are noops in master (due to Merged-In).

Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705

2020-09-10 08:18:00 +00:00

core/java

Add 5G NSA to collapsed RAT types list

2020-08-12 05:20:54 +00:00

packages/Tethering/src/android/net/util

Update language to comply with Android's inclusive language guidance

2020-07-29 12:05:04 +08:00

services

Merge "Skip RAT type listener registration if IMSI is not available"

2020-08-20 02:20:31 +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%