dfaba10dba329e6c823572633c5a33a534019a48
511c26364f to master
Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
Description
android_packages_modules_Connectivity
Languages
Java
81.4%
Kotlin
7.7%
AIDL
4.5%
C++
4.5%
C
1.7%
Other
0.1%