Lorenzo Colitti c8f90ba551 Merge changes I982543cd,I41c3bf6c,Id3e5f6e1 am: 4fe79a3ff9 am: db7c229729 am: d5450e378b ...

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

Change-Id: I91ccdc9a5f4426d9c1623b869c0411b9af203c36

2020-11-30 15:05:48 +00:00

..

java/android/net

Merge changes I982543cd,I41c3bf6c,Id3e5f6e1 am: 4fe79a3ff9 am: db7c229729 am: d5450e378b

2020-11-30 15:05:48 +00:00

jni

Update language to comply with Android's inclusive language guidance

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