diff options
author | Sudheer Shanka <sudheersai@google.com> | 2021-01-13 21:18:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 21:18:10 +0000 |
commit | 84aeb1bcddb1d7f419d2dc6a7457b31ddd385f88 (patch) | |
tree | dec69674a5e08be588ece0a67887cda8c415b24f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b1eb8126ae12d9f33b93c24136182ad0ab117658 (diff) | |
parent | 976b9f84a0833cd7d29a5d797068f857216e09a3 (diff) |
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e am: 7e2c5975c5 am: 976b9f84a0 -s ours
am skip reason: Change-Id If04f63361bab424abf5aa6e980067f689fd46622 with SHA-1 89ed673fc8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545585
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib75164567d6f06552cc3852424229b31d7c52877
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions