Benedict Wong 31e9738f74 Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50 am: 130409d40b ...

am: 0a64c3711a

Change-Id: I998d44bac0993a8f2e9e228a0b0a80adfaa4d87e

2018-01-24 20:07:20 +00:00

core

Resolve merge conflicts of aedd67b6cc to master

2018-01-24 15:59:26 +09:00

services

Merge "Add TunnelInterface API and KernelResourceRecords" am: eb2ff56abe am: c5fb7341b1

2018-01-24 09:54:06 +00:00

tests/net

Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50 am: 130409d40b

2018-01-24 20:07:20 +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%