tree 9f5f658fe08b092a243cd78d2b2c51c40776e253
parent 2c5dbb357c06168983cd4109d28a581954ce31b0
parent 758c74fc5fbdab0c31696eb782a6e138c2fe9f6e
author Xevi Miro Bruix <xevi@google.com> 1595869710 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595869710 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: 758c74fc5f

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1371329

Change-Id: Ia2065a71f09fefe09d05f9a4a173287ee22feebd