diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-12 10:31:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-12 10:31:55 +0000 |
| commit | cd66867a1b1e6c90d5755de5d5b5ab670797413c (patch) | |
| tree | c5f01c97eee3b2d3a8808414ffee9a779bf8b1dd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dba76d67eb22e8040c2caf58f9cd2d40273e3659 (diff) | |
| parent | efb48827441966b21911ae11462cbbb1596e565a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: efb4882744 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14943246
Change-Id: I5f9b1b24e063a16c70b7f7e3dd25aff28bac883b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions