| commit | a47e1f9a244bfde4e2ad8fbea65e981b6c5acb4f | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Thu Aug 13 20:17:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 13 20:17:25 2020 +0000 |
| tree | 4c6096b6b8936e5b72f1866d57608ba6b0334528 | |
| parent | 6a55cd1644f2095c9cb5a533a1e4464bf0edae71 [diff] | |
| parent | 7f45a6fcc0faa20d62b5432b84569cbaf5ce7277 [diff] |
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342 Change-Id: I47ccfab7dd61ebd29360ed5bf012942f2547c0d0