Bill Yi 199665e32d [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 77c27b78ea -s ours am: 1221d9265d -s ours am: 2da01b3354 -s ours am: 700a5d9538 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: I1713ac8976730a0e6a414cf0e761f7f0267cf51e

2020-09-15 20:32:15 +00:00

core

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

services/core

Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 63b0d576a0 am: 8ea944d77a am: ecf857098c am: e1a8529932 am: 9130c1be11

2020-09-14 06:04:58 +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%