Anton Hansson 0c02379ec1 resolve merge conflicts of 1381b1d9a77260d78a3a67359e16c06ee388d37b to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I5afdfc8e1e523768db9065dd3571cb31bc1dfac5
Change-Id: I5c5b85f516dba0d403eeee06055953931d2198aa
2018-02-26 15:36:28 +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%