tree 0b229a7d5eb4d418e397fb408973d7165f3628ef
parent 1ed59262c9e8d6f9eb5c8adfbe49142fe56c330f
parent 2b0eb144a4607ce2ab9d0b1d7d0b7be955082c1a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692667025 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692667025 +0000

Merge "Update language to comply with Android's inclusive language guidance" into main am: 5e6c5c36a5 am: 31556d6548 am: d35bba3aea am: 1184c1dea1 am: 2b0eb144a4

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

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