tree d10a26f308478c7aebd55d248eb7d20d10adcf4c
parent 5bf2b05e8e52a6ed58bd4b275fa1da707f2a5865
parent 19dfb7bf93f34448fbc980ebad4988cd7034bef3
author Treehugger Robot <treehugger-gerrit@google.com> 1596096524 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596096524 +0000

Merge "Use inclusive language." am: 1222133ffc am: 19dfb7bf93

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

Change-Id: I2834e1199c4c436f761af170feb743105e5221ae