tree 79518e94c337a8c24a96efa6c39cfd6f6aa518d0
parent 4342d200c6e8f6fecea7c6612089eb9ee13a6fe8
parent 0521eb758a7f32ecb74e597c1a0c7c7efac311ca
author Treehugger Robot <treehugger-gerrit@google.com> 1596238550 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596238550 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a

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

Change-Id: If60583d39beeb643bffad3f8e86a07e480ec97cd