diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:40:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:40:21 +0000 |
| commit | 6729d36e2e3c2ff1e27cd0ca21f96e9648fd514d (patch) | |
| tree | c16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d173309eaf98051aaf82e217e0d333df4c695232 (diff) | |
| parent | e3f1bd584273b90371f0a3e2f776a6e5edbc488f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 4349d7e867 -s ours am: bd30d0521d -s ours am: 63b5dd138e -s ours am: e3f1bd5842 -s ours
am skip reason: subject contains skip directive
Change-Id: I2e19ed16a3c6be2a56c4c5deda97d0b9f9605174
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions