| commit | 32d5d87fb2710bc0fe33a709f2857ba56a11fb19 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 21:50:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 21:50:57 2020 +0000 |
| tree | 256f06a5ebcb6e03153f3ee6e3d363b6e69ddfdd | |
| parent | 19eb130f0216071bed8f193e939c11134bfd7eb8 [diff] | |
| parent | a67193d1031b2a460cf7552c357159987bf57621 [diff] |
Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906 Change-Id: I0f2f489b8b6cddfbf86838e0acf48857fe740a6f