fc719b474aed2f28b48b589caa4b144a8d68d493
f444e9d182
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695 Bug: 206073065 Change-Id: I2bbac80ae1b2f64166d6598f72e156b23c0f019e Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27 Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210 Test: Test: I solemnly swear I tested this conflict resolution.
am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev am:
5c716c26d6
Description
android_packages_modules_Connectivity
Languages
Java
81.4%
Kotlin
7.7%
AIDL
4.5%
C++
4.5%
C
1.7%
Other
0.1%