Chalard Jean 09acc26118 [automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours am: b4d60515ab -s ours am: 8fd8590f92 -s ours ...

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history

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

Change-Id: I8a133f595e5f40a0aec4b831070997c9a0fa4bdc

2020-08-07 07:37:08 +00:00

core

Update language to comply with Android's inclusive language guidance

2020-07-31 08:18:33 -07:00

services/core

Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f am: 759c08d0f4

2020-08-07 06:02:12 +00:00

tests/net

Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 am: 0317f66f27

2020-08-06 16:06:20 +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%