tree 5ed0aaf617102d23869006f424acb03f96487496
parent cc817619450442edac50190f4258c587dae9424b
parent c0e359ff2c0b7294e00e4b112c1225047ec2ca8c
author Treehugger Robot <treehugger-gerrit@google.com> 1596157356 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596157356 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: df9c0ce0d6 am: 9d5f5e2a5e am: 0cc93e30c4 am: 5b3c38fa33 am: c0e359ff2c

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

Change-Id: I533aec13284eb989d516fc77c14cf38ab3a7027d