Automerger Merge Worker 7c15974482 [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours am: 09d264f306 -s ours ...

am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: Id6a067912a46cbed8201da3a9057d183017740d3

2020-05-12 22:32:41 +00:00

core

Merge "Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e" into rvc-dev-plus-aosp am: abd8340a70 am: a1424e18bc am: 29638bc032

2020-05-12 18:48:04 +00:00

services/core

Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e

2020-05-12 17:27:09 +00:00

tests/net

Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5 am: 51edeeeb65 am: 88d1b83af6 am: e0336ca4d6

2020-05-12 18:47:10 +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%