Bill Yi 3670206d48 [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: 448394b278 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef

2020-09-21 08:27:05 +00:00

core

Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce am: 4e9a12f773 am: 5d45f311b1 am: cce3906d82

2020-09-15 21:01:48 +00:00

services/core

Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef am: d4ce551094 am: e1615d27e4 am: c6ec9fb2c2

2020-09-16 08:54:35 +00:00

tests/net

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

2020-08-28 12:30:17 +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%