tree ac9dc7e820210368ee33d0f281371706f0dc816b
parent bf9f6b4f3b641d50855964a58e6a58221180014e
parent f98e615b6d2d38ac1072f7bc274ce39140d43380
author Treehugger Robot <treehugger-gerrit@google.com> 1597367289 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597367289 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d

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

Change-Id: Ieb38a2506f125763f4df572ffd6e18a9c663f65e