diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:34:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:34:31 +0000 |
| commit | 64676c7ec8ece6fd3c286c64048a02b91914d3b6 (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 52f88dbd7140eb715f904aba79d7108e22e915c3 (diff) | |
| parent | 545affd91cf205707573c3b3d76dda3d7fe6bf8a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours am: 545affd91c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: Ia66f439828ddaaa08f22bd8bba31269320120a0a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions