tree 7cf9fb304b00c644be9bb34c87b049294fa37811
parent 590462e11052cea1b596aa28df479a173dddcf32
parent 636b8751305e746877a54e236b9e65ef2b85ddf6
author Chris Wren <cwren@google.com> 1595602962 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595602962 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: 45171e65be am: 4391d318d1 am: 636b875130

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

Change-Id: I3a9951a102c739e50ed172282b44ddae520a5bb1