tree 51ad949628bd8cbe9919ac0cae838e0b25bcd837
parent c46340e92cc0f623a9438f6b02ece4da18143ff8
parent 81aa66c9807ec6d24c408492e249f91f72b66585
author Treehugger Robot <treehugger-gerrit@google.com> 1595993667 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595993667 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980

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

Change-Id: I8279d46549d0df8c403c7fe9f5ba91f4eb11a9c9