Benedict Wong 9e2e358045 Merge "Add TunnelInterface API and KernelResourceRecords" am: 7a7d04e103 am: 7cacbb3c86 ...

am: 54cd11245e

Change-Id: I955d5090171f08e4fa20eac5bdfe761132b87d35

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

core

Resolve merge conflicts of d15f09adf7 to master

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

services

Merge "Add TunnelInterface API and KernelResourceRecords" am: 7a7d04e103 am: 7cacbb3c86

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

tests/net

Merge "Add TunnelInterface API and KernelResourceRecords" am: 7a7d04e103 am: 7cacbb3c86

2018-01-24 09:54:06 +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%