Xin Li 59b852af39 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 4d279942b4 -s ours ...

am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae

2020-09-11 03:33:28 +00:00

core

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

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

services/core

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

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