tree b07b0ecbc5eedb47c6a1bba1e39abd24279e759e
parent f1eb1e4233117671d2f71258af9013287007a05f
parent 9b0cd12ce4cf04884c0dab78d1f9ceba64beaded
author Chun-Wei Wang <wangchun@google.com> 1597236400 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597236400 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 am: 9b0cd12ce4

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

Change-Id: I63e2a1c54969fc74f80657a63d98559eee312549