tree 7e597d8d8e75b8408c23d82b5852e98b1c194967
parent 3eece79af72351c8b2d04f6a0bf0106753333de5
parent e1da6458e0f14dfe17c6fda5e74ef71c672a599f
author Treehugger Robot <treehugger-gerrit@google.com> 1595997167 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595997167 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b am: fe9e5f31bc am: e1da6458e0

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

Change-Id: Ia40d121015725fa539c20f14930e9e95a3b0f84a