| commit | 9520ff93711dd18de5114da9959e5cd444040d54 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 06 13:46:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 13:46:30 2020 +0000 |
| tree | 6443be95baab2c7610484ef033ccbba76e7a05d1 | |
| parent | 5316267ba9a346dc8eaa54ae35a232209ef4b118 [diff] | |
| parent | ad7b480720e12472c277b3f7fce0a3210843d390 [diff] |
[automerger skipped] Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 am: ff642c408c -s ours am: 80b4e4de4c -s ours am: 847b1d7cba -s ours am: ad7b480720 -s ours am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078defd is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724 Change-Id: Ib012be89f3b6c05341f55bc94b41b1d75cb6c1c9