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

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

Change-Id: I7da537200efe31e803234bd1a0236843064186c8

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

..

ims/internal/uce

Add back ImsUceManager status definitions

2020-03-12 17:33:39 -07:00

internal

Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347

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

server

Update language to comply with Android's inclusive language guidance

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