tree e112ca74f45ee566adcf2e88be390ea811cbc2d6
parent 26d3e569dbdff0a0b8f0c78b0c816e7328c7e5a9
parent 2f9678b015ece666c767b09ccf9a23727ff8db7f
author Treehugger Robot <treehugger-gerrit@google.com> 1596073388 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596073388 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015

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

Change-Id: Id3e8bbcc2d0b58a825a5c3a390b1b80a5b52fdeb