tree 1fe50ce61126b654f0e028f0ebe9d111d87c5e15
parent 606a45341b15f6652b864fe25f4622b484f8b6a3
parent 92876acc20e0ce4675545bcae6ea71f971891166
author Treehugger Robot <treehugger-gerrit@google.com> 1597928566 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597928566 +0000

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

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

Change-Id: I99915dd0ff99245aad2c31e2d0c0a7daa79f0b92