Jeff Sharkey 487d394296 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 ...

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

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab

2020-09-15 00:13:08 +00:00

..

ims/internal/uce

…

internal

Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570

2020-09-15 00:13:08 +00:00

server

Update language to comply with Android's inclusive language guidance

2020-09-14 10:00:05 -06:00