tree 641404e611e6deeb09f6c198c88077a3005f22c8
parent da8060eae5eda23e5248bec426d643815c6a5979
parent cb6b00197df90da56c95d31d267e9419f48beef4
author Chun-Wei Wang <wangchun@google.com> 1597237493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597237493 +0000

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

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

Change-Id: I99e9914ae5fc68aec6884a6f5c014ab458fc6464