| commit | ba0de0c9bbbf66b5c41edc4b7e1c99f3ea227498 | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Mon Aug 03 21:25:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 21:25:57 2020 +0000 |
| tree | 256f06a5ebcb6e03153f3ee6e3d363b6e69ddfdd | |
| parent | e56c1961e6365d849d55c08bbd89a9d8f49169b5 [diff] | |
| parent | 9c3acacc5c4ef68963c8d42599194c4325b88c93 [diff] |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 9c3acacc5c -s ours am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 2349cf350b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906 Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f