tree fe6232241ec6a0213877f38b1962dc5b9d385abc
parent 54947f61a3cbcc5cc5aa06fcd6a238749cfa3e04
parent f3a62589b8011546f1244aa37c7af4d48ffde682
author Chan Kim <kimchan@google.com> 1692756736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692756736 +0000

Merge "Update language to comply with Android's inclusive language guidance" into main am: 0698cb8b64 am: fc3617d1e1 am: f5078ee645 am: fd9e6e3efe am: f3a62589b8

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

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