diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-15 20:13:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 20:13:04 +0000 |
| commit | 6d294c564d4dd4d8bf1e7a509d1a9622648aeea4 (patch) | |
| tree | c95b8d45b10a07a700b3a0952ab241c50c7ba5dd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1d73e3e3b126b85a4c48721a621faea460c9a671 (diff) | |
| parent | 43b5b509ab4ba679c4539ee2ee0b2f068318c174 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 569d391c8a -s ours am: 43b5b509ab -s ours
am skip reason: subject contains skip directive
Change-Id: Ic53373d3de7b60c68632cc7618299a1a4c77385d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions