Bill Yi 6fd4703c21 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -s ours am: 98318fb25e -s ours am: 399b1982be -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: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab

2020-09-19 08:02:00 +00:00

core

Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089

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: c4aaac8af6 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%