tree 203f08cb51d2ec0a934ee02a365592fedf427537
parent ba1245d651610ca0ca7635347bc39ccdbc4c8be4
parent 36efe13de9eea6082b280cd6bd1e0bea840b3176
author Treehugger Robot <treehugger-gerrit@google.com> 1595955502 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595955502 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9

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

Change-Id: I1f4becb31d39e151e64fc18ab420c23a6682eed7