tree 35f2d96f4b78f28859b70f3790dbb519c9350f70
parent 9d5f5e2a5eef3d188afa66e294a8b1e94786ad26
parent 18e37909f3e3a41c403670c1c5a08a3354bc5c83
author Treehugger Robot <treehugger-gerrit@google.com> 1596071168 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596071168 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 18e37909f3

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

Change-Id: I6afccdaa61db8d1d9f4407e252f22857e578ea9f