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