tree 886885071ae58d9b81fb546de452e710575c2d0a
parent 4b187f044adab3ebee30c23c6199a39f60f1d4ce
parent a3b73fba11ce9c71bae4bd9e11abccd28c8d0071
author Treehugger Robot <treehugger-gerrit@google.com> 1596236984 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596236984 +0000

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

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

Change-Id: Idaec3eb44b854a86cae20f7c955acc0e2698800e