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

am: 27b9dd89db  -s ours

Change-Id: I6ac35f90d62b08cb6cae66b9ed001265a7496aea

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

core

Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev

2017-08-18 11:46:22 +00:00

services

Really allow NetworkAgent immutable updates to NetworkCapabilities

2017-08-18 12:44:26 +00:00

tests/net

Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev

2017-08-19 00:54:59 +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%