tree 741b9661ecce9dca3180ca5974dd0976c2a8379c
parent 89854ca60ceb205a4f8aeb845cb5cd059532426e
parent 1b58f156cde63cba152c77f3ed9f7a0adf32d136
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692813639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692813639 +0000

Merge "Update language to comply with Android's inclusive language guidance" into main am: 4af0170659 am: 1b58f156cd

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

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