Lorenzo Colitti 358aeea9d3 Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f am: 5bbcd79710 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I430d7069e1dfbe89780cb459fff9e1eb63daa349

2020-12-10 09:18:35 +00:00

..

java/android/net

Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f am: 5bbcd79710

2020-12-10 09:18:35 +00:00

jni

Update language to comply with Android's inclusive language guidance

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