junyulai 19ec97e903 resolve merge conflicts of da290bec0c5418e758b92abad7be8e729cf37d68 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I719965f13d1f726fdac5b475fd8733b07e28f5b6
Merged-In: I3d94acb71c142ec38b750e58822881ff383341cc

2019-01-21 12:22:13 +00:00

core

Merge "Adjust map names due to new bpfloader"

2019-01-09 18:34:49 +00:00

services

fix getIfaceStats and getTotalStats bug

2019-01-10 12:16:25 -06:00

wifi/java/android/net/wifi/p2p

[P2P] Add binder to service calls

2017-06-06 17:23:44 +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%