Bill Yi 700a5d9538 [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 skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

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

Change-Id: I36d5555b5fa23140e4916f568353af25b579c653

2020-09-14 22:20:16 +00:00

core

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

2020-08-28 11:09:43 +00:00

services/core

Merge "Handle lockdown VPN reset intent in ConnectivityService"

2020-09-14 03:14:51 +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%