commit | db4b7127a27b9ba47c4490d4777d6ea0ad73742c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 24 01:45:58 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 24 01:45:58 2020 +0000 |
tree | db870e63d692c0758f5be9a51ece3c1c4c428492 | |
parent | 7d8087d4c11af77a3225108967cd0032ff86c09a [diff] | |
parent | bfd630d112e70f62c15818f15ba176b62bd5d008 [diff] |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe am: e34fa22622 am: 824a6b93c8 am: ee6c5882a1 -s ours am: bfd630d112 -s ours am skip reason: Change-Id I6dac60aac172a8fccf4b5671107b41c5c84ccd76 with SHA-1 c22364237a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648 Change-Id: I1f0ab72719ea183b57e904faa4a64227e29282dd