| commit | e68dedb5e0b9817d50c81cfd2968b4f53fc9260b | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Thu Aug 13 21:11:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 13 21:11:52 2020 +0000 |
| tree | 6d840b89532a7333bf0f32a4b1c8808d9ee87851 | |
| parent | e72ac94865274310742ac8927690da58157f3f0a [diff] | |
| parent | b018ff78b158e84938ae637edefef4bfaf891448 [diff] |
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours am: ee63631f2f -s ours am: b018ff78b1 -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: I0d4ebd00643e3de6f39b36ba3d8c826ce0dbb914