Valentin Iftime 55738c4aa0 resolve merge conflicts of c53848b014 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af
2019-10-08 22:21:44 +02: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%