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