Elliott Hughes 13d5a1d648 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp ...

am: ddd7dd8e7f

* commit 'ddd7dd8e7f7d661e4a411f2c9f14f69a86e172a4':
  Make android_net_NetUtils include what it actually uses.

Change-Id: I84a143e1922c7180a0a1926d2cfd87b59bca137d

2016-05-13 16:06:35 +00:00

core

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

services

Merge "ApfFilter unit test" into nyc-dev

2016-05-13 14:38:13 +00:00

tests/CoreTests/android/core

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -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%