b0fd216df4a7092319f96f7a369aa689b6262a79
18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a am: 923b316408 am: 5e8f6ed01b
Original change: undetermined Change-Id: I924fc046d7d4bb382a6c20a022024eb4ca761f01
Merge "Update allowed on restricted networks getter/setter" into sc-dev am:
962e174260 am: ce1dc4feb1
Description
android_packages_modules_Connectivity
Languages
Java
81.4%
Kotlin
7.7%
AIDL
4.5%
C++
4.5%
C
1.7%
Other
0.1%