tree ae383218cd62c33b51a70741648570776f19f7ac
parent 739663d450ef60333664867e3380bea67616512e
parent 1a3ff012172bacb915399d436a795b7f8ed89ed5
author Treehugger Robot <treehugger-gerrit@google.com> 1597930155 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597930155 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc am: 28a65b8942 am: 92876acc20 am: fdeef2b1ed am: 1a3ff01217

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

Change-Id: I61d6b7591059e1c91d878d3c55d9a84d3bf3c800