Xin Li 1fad913736 [automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 93a76f8e40 -s ours am: 8cb242af98 -s ours ...

am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

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

Change-Id: Ib5972f772565b2bd10e6ccee5014719037898252

2020-12-03 04:39:51 +00:00

core

Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479 am: 0d1b3960e8 am: bcd4d930bc

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

services/core

Merge changes Ic5a3e169,I76daa3ab am: fac6ce5e4d am: 642fe3bb2b am: 4a0fe09eec

2020-12-02 06:42:39 +00:00

tests/net

Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479 am: 0d1b3960e8 am: bcd4d930bc

2020-12-03 03:47:02 +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%