tree e6402dd862d44962e8620343300a9a8db92b6489
parent 7dbda7a1c2d485e01c2f42e5e228f212b08348ed
parent 2bc333e497fc2416bfe86f7db84cce614651029f
author Chun-Wei Wang <wangchun@google.com> 1597238882 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597238882 +0000

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

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

Change-Id: I8ca087405168151c31c04bc5fa0f74ccf3f007bb