Xin Li f8813cbe3f [automerger skipped] Merge changes from topic "PPRL.190205.001" am: f6abf78795 -s ours am: 0b448cafc4 -s ours ...

am: c859266980 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 afc94d724c is in history

Change-Id: I9d0dd19c248b350d12233c4d9a71a30659021388

2019-02-20 11:26:07 -08:00

core

Merge "Remove NetworkMonitor dependency on ICaptivePortal"

2019-02-15 05:39:14 +00:00

services/core/java/com/android/server

Merge "Update VPN capabilities when its underlying network set is null." am: 9e226700d9 am: bd97fcd674

2019-02-15 04:11:55 -08:00

tests/net

Merge "Skip unreachable route when estimating VPN destinations" am: 3b3871c9e5 am: a480624ebd

2019-02-20 04:35:38 -08: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%