tree 1a3085b0777177819545136f9d01e442ead1c39f
parent 1b2341bded7b99c113ebaa8bb0840cdf53da86a5
parent 47ae97cf2a1ca7804d9d5464a7ad58a3888a0ed3
author Treehugger Robot <treehugger-gerrit@google.com> 1595968502 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595968502 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 17867fdf87 am: 0071fe0249 am: 47ae97cf2a

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

Change-Id: If0e9adfcde9366be80deff6de364e1804fb9f4f0