diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 21:36:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 21:36:07 +0000 |
commit | bc5c954e8a7b4cf19118ddb80279796cdeda66e6 (patch) | |
tree | 938a593a5af42c4e0d8aa75966ad57863142f149 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2b12cdda7f76d601e5d7f14cc3aa8221d31fdc92 (diff) | |
parent | 8a8954ba4810e70a06d31551a358888b45780635 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8a8954ba48 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140643
Change-Id: Iaf28bcdf45cec699bd720a326313b4b970143e5d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions