Jeff Sharkey afd130b8f9 Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce am: 4e9a12f773 am: 5d45f311b1 am: cce3906d82 ...

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

Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647

2020-09-15 21:01:48 +00:00

..

java/android/net

Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce am: 4e9a12f773 am: 5d45f311b1 am: cce3906d82

2020-09-15 21:01:48 +00:00

jni

Update language to comply with Android's inclusive language guidance

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