tree aa8d9ee281c25e9b50bbc66a4d2645193c03bf36
parent d82657834adfdaf4a127ee4fcadd64273584ef40
parent a42c8fc0c10041bcf1db21f1accdbdb29cfc8e82
author Treehugger Robot <treehugger-gerrit@google.com> 1596235322 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596235322 +0000

Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a am: a42c8fc0c1

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

Change-Id: If4cc44baac9e5cd03022e539c2c848b0be873740