tree 94603114e99587b89096abdcc224c19b9993208b
parent 772d87c0e15ffc83efd58d7f71e0afd63559fe12
parent 0490999da3eaa7dd5c398158fb34fb73b2c623d1
author Treehugger Robot <treehugger-gerrit@google.com> 1596515745 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596515745 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3

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

Change-Id: I0e32fc0efc33ddd25cee10c8a06662ac29420a89