tree 52d1b8cdfe4d1d9142647b594737943563939e41
parent e1aa8355577de335ab1dcad3c4d74808fb97364f
parent 96c184e1cf3a8bac7658dfdf8019e6c1fa16c4e6
author Treehugger Robot <treehugger-gerrit@google.com> 1600862844 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600862844 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30 am: 15c70f85ba am: 96c184e1cf

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

Change-Id: I5b7e47e200d0d41cb478b5203c84c89de981c1fb