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

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

Change-Id: I7da537200efe31e803234bd1a0236843064186c8

2020-09-14 23:10:42 +00:00

..

java/android/net

Update language to comply with Android's inclusive language guidance

2020-09-14 09:59:01 -06:00

jni

Update language to comply with Android's inclusive language guidance

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