diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:16:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:16:10 +0000 |
| commit | b447f33cbad1bff8cda7cfa23d64223c50c258ae (patch) | |
| tree | fa5d13dde773516ee037884b269cf25a1c31cb7c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 63b5dd138eded331a941e6ce0ddcf2cc57ecccfb (diff) | |
| parent | 24bb35c160bd20d32128e07a0c2227e731331ea6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b1b49973c5 -s ours am: 24bb35c160 -s ours
am skip reason: subject contains skip directive
Change-Id: I6c596ebbb14c5ab0da9d2776615eab90bf4df77c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions