diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 01:45:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 01:45:51 +0000 |
| commit | b58a50b13054f3f30d854bb88f080739b9d32a89 (patch) | |
| tree | 36df8dc5031f984ca1da8b90fdbc8ecd5639cee3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 68d208e6fa6bdf666951685bdd7e706741441377 (diff) | |
| parent | c6199ca4d883cb1411c251e49e4349355c80a6a8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 805865c314 -s ours am: c6199ca4d8 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fb736f28768a041f4d541e5bcf6bbbc77be234d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions