tree a8369c575e15382b8347642b45c8d8961e935eb5
parent 6f22d2c3107e343e70c95a09e5e1128fdb0f4b02
parent 09b57ae95f41daa9d1b4025f4a97918dcce0d361
author Ivan Lozano <ivanlozano@google.com> 1596220280 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596220280 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f

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

Change-Id: I259fb2ecd5ab6936ae7fc1ff4d3c78658d7b2b59