tree d174028f664320f45bd574127eb2f552dfa2e31a
parent 7bb2d76712c5879c37cd1478cc4646a066a588ce
parent b83d4c43b8b4a86eb010bc9aec44081e2e46c196
author Chan Kim <kimchan@google.com> 1692666915 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692666915 +0000

Merge "Update language to comply with Android's inclusive language guidance" into main am: 6318d8ca06 am: 9af7260906 am: b83d4c43b8

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

Change-Id: I347e3fa40d2e32705bf7dc418e652c2ccdca7c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>