tree adecc4a5550f0c008b42c9a717e34547cb154ad7
parent 2863f04c432497271ae24665e382e3751e4a30c6
parent ba422d29e035a8a14d5cb26b8b4c7b13260b3d1d
author Treehugger Robot <treehugger-gerrit@google.com> 1596074509 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596074509 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015 am: ba422d29e0

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

Change-Id: I38145552ef5364e488946e4cf71d70beaf25217f