Lorenzo Colitti 8c4677ab39 [automerger skipped] Merge changes from topic "niap-vpn" into qt-dev ...

am: 5fd9ef13f2 -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 07ad31c3ec is in history

Change-Id: I4775263c2f422a9738812b02be61e2af95e9c472

2019-04-24 23:02:31 -07:00

core

Merge "Move NattKeepalivePacketData out of the framework" am: 7640cb0157

2019-04-23 21:26:03 -07:00

services

Merge "Update exception type thrown when NetworkStack is missing" am: 18aa9b67ea

2019-04-24 21:31:21 -07:00

tests/net

Merge "Reinstate new VPN uid filtering unit tests" am: 5dd56f3e47

2019-04-24 03:05:12 -07: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%