Tyler Freeman 9e41f13ae6 DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev ...

am: 27b9dd89db  -s ours

Change-Id: I055554715c9ea2095926a01fa539c20bb6dd67f3

2017-08-21 21:41:22 +00:00

core

Merge "Add convenience methods to IpPrefix and LinkAddress"

2017-08-16 14:49:27 +00:00

services

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"

2017-08-18 11:59:02 +00:00

tests/net

Merge changes I325b13d5,I89719fe7

2017-08-19 03:15:08 +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%