tree e57260cc335eee56e4bfd0acf8bf296a946cc15c
parent bff21e5c03ef4602fbdbd38566483536bc04e0fe
parent 2020cf0234cb7bc14eccc37adc18bbc2c97c8297
author Treehugger Robot <treehugger-gerrit@google.com> 1595969614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595969614 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: e211918c69 am: ff0a6eab18 am: 9ab827cc25 am: 2020cf0234

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

Change-Id: I35b064b4513fbe1600642f587d24850b60414ac4