James Mattis 07ae51bd26 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 73877e08a8 am: 0829a6ac61 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: I33da7fd0b61eb0d5a6b45b4ba2140b39c377e15a

2020-10-28 00:38:12 +00:00

..

java/android/net

Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 73877e08a8 am: 0829a6ac61

2020-10-28 00:38:12 +00:00

jni

Update language to comply with Android's inclusive language guidance

2020-08-03 17:04:58 +00:00