tree 97ea5f8c6464beb294442610df11086a5e6d70bb
parent cbbacff29fda4358f2c53ceea5d7aeec34f21f21
parent 230cbcc6117d3f3dda2c467ccf1d36e04eccae33
author Chiachang Wang <chiachangwang@google.com> 1596155060 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596155060 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70 am: d3a216ae4f am: 230cbcc611

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

Change-Id: Ic73d5ae40bfe8e37bbe96b96d6975e305f4c849c