diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 05:51:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 05:51:34 +0000 |
| commit | 79516e9796f4a9a06212acfaadfac13ff26176bd (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 134a338d54efeebcabb331101e47b5eb7119b6f0 (diff) | |
| parent | ca55daedd216f32cd8c5d1a6843baa181096d98c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8315ae79d -s ours am: 2b757435b9 -s ours am: cec42773c7 -s ours am: ca55daedd2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014870
Change-Id: Ib8cc10a1217267256428fbcd7e92d0969da72db0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions