Bill Yi 448394b278 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -s ours am: add0444867 -s ours am: 70b18ac7e7 -s ours ...

am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b

2020-09-19 08:01:04 +00:00

core

Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce

2020-09-14 23:10:42 +00:00

services/core

Merge "Remove a useless method"

2020-09-16 05:58:01 +00:00

tests/net

Merge "Notify the keepalive is stopped after the slot has been released" am: 09a0f57f87 am: b5e1feccbe

2020-08-28 11:09:43 +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%