commit | 45b3822a3cf98ab85dbcb5abcfef45760129a45b | [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 | 89177084c64b9eb838f81f65345585920c26d135 | |
parent | e6d76eb39d276d4be17aa35b1e17e4e67b26a579 [diff] | |
parent | e7b108a3b5ef505d0856e86b9c3a0cb3bb0daed0 [diff] |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906 Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f