Igor Murashkin 5ef32c9748 Merge changes into stage-aosp-master am: 8b2dc0adc6 ...

am: e0065199ea

Change-Id: Ib857b990a0938889b134228d78a32398a72be102

2018-10-05 12:12:17 -07:00

core

resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp

2018-10-04 22:50:39 +00:00

services

[PT10] Move loadGlobalProxy into ProxyTracker.

2018-10-05 16:37:38 +09:00

tests/net

Merge "Allow wifi and ethenet connected at same time."

2018-10-02 17:09:16 +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%