Xin Li 37db1eb217 Merge RP1A.200720.011 ...

Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7

2020-09-02 12:34:37 -07:00

..

java/android/net

Merge RP1A.200720.011

2020-09-02 12:34:37 -07:00

jni

Update language to comply with Android's inclusive language guidance

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