tree 621c85a5ebdd9ea145406e7e84e9d581e1d2112d
parent f0d495611dcf22c2536e12b3b2e6ca0a71f5e52c
parent 04ddd768c2656491fac1316e992e589626c772bc
author Jason Hsu <jasonwshsu@google.com> 1597814705 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597814705 +0000

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp am: 8dc88a6a46 am: 04ddd768c2 -s ours

am skip reason: Change-Id Ibbd97bf31915d59b5110cbcc8f2126f7a7221060 with SHA-1 cfb9bd346c is in history

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

Change-Id: I832f6080c85699bce11e7992d6bc51ddc5dadb83