Automerger Merge Worker 3f06b4a274 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am: 32d5d87fb2 -s ours am: fd6c45a516 -s ours ...

am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history

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

Change-Id: I47ed5a61f64780959ede414a5c07b323030cad3d

2020-08-03 22:27:49 +00:00

core

Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fd5ab3e01b am: 19eb130f02 am: 07136ca39c

2020-08-03 17:06:35 +00:00

services/core

Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68

2020-08-03 11:18:31 +00:00

tests/net

Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 am: 715a48b386 am: 0f9b51cb06 am: 8ac1f7d5de

2020-08-03 12:20:18 +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%