Aaron Huang 404eb55a33 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours am: af780315ab -s ours am: e1b50696e0 -s ours am: beff4c52a9 -s ours ...

am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history

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

Change-Id: I02a95fbeddc4dda3efa8ed93c3b92de28bb756f4

2020-06-17 10:01:08 +00:00

core

Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c am: e980440591 am: 26d802f1ec am: 6c003e8896

2020-06-15 17:54:29 +00:00

services/core

Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c

2020-06-15 17:33:33 +00:00

tests/net

Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697 am: bd4096a4b6 am: 6189d49c67 am: 9a096560bb

2020-06-16 01:44:23 +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%