tree f6c44de96748ead92f93e540ebe1a29835219426
parent 79f4337f1b034f5874268f763abb0ac3bc6e748b
parent bdffa070016e32862247750cc70ac061e8a9e47e
author Treehugger Robot <treehugger-gerrit@google.com> 1596423560 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596423560 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 am: f363e6306b am: bdffa07001

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

Change-Id: Iec417650eb13ad15ac93ab9cf3b770fabd6d7580