Anton Hansson 4cfa3beb5c resolve merge conflicts of 1381b1d9a77260d78a3a67359e16c06ee388d37b to oc-mr1-dev-plus-aosp
am: 0c02379ec1  -s ours

Change-Id: I8bc040bea87ffb581568eae69cafb2c65fca9412
2018-02-26 17:08:31 +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%