| commit | 06a47fd5127e5f3229d5c5da1d7cabf781f6fbd8 | [log] [tgz] |
|---|---|---|
| author | Jason Hsu <jasonwshsu@google.com> | Thu Aug 20 08:28:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 20 08:28:19 2020 +0000 |
| tree | 95100a9f2df732ef4ebf9a82108a75982e13de04 | |
| parent | 7aeee6f2e64a7610601c820a1470f7569b501fad [diff] | |
| parent | 34f94de5dfc2e393a6060663b3c5969d3e9f2d89 [diff] |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours am: 0710b9589d -s ours am: 34f94de5df -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/+/12406773 Change-Id: Iab745723d8a7c92a575391bc15bb2d9a19e270a3