tree a8aeb21d46859f5c0b1da1ff7b1920ca953d2fe7
parent ac0b349efdeebcfd24677e2fd42dfb17e89c642f
parent bd71f2b6365fdcc0719d4d35f69c821e86574457
author Xevi Miro Bruix <xevi@google.com> 1595870625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595870625 +0000

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

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

Change-Id: Idc779182ef2ec9a061a79e07f73cc3d083fbce2c