tree 6d92c99b676b2f5a0e5b74ad99e4e7a557479f10
parent 5ab2b0f175eaf38c0f8d5c4cb627d24cc22acfb8
parent 641b9da4210b114d3214293a0123fb7c1619a322
author Kelly Rossmoyer <krossmo@google.com> 1599863684 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599863684 +0000

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214 am: c19fd3c4cb am: 641b9da421 -s ours

am skip reason: Change-Id I26ef8e079bf13f19bdc3bbc8219f572a43b68090 with SHA-1 1e57db95a1 is in history

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

Change-Id: Ibd2f158f0ea802be5f633528ca81a6bb18fdc084