diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-15 20:12:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 20:12:52 +0000 |
| commit | 32d05f44af218271559ee3a95e601cc7200abe16 (patch) | |
| tree | c95b8d45b10a07a700b3a0952ab241c50c7ba5dd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a81928977e7b7d0e24e62c75c6cd695fcaf7a5e1 (diff) | |
| parent | f6684896c8019bf5a3d573359a377f8b8c0805f5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 98c8576164 -s ours am: f6684896c8 -s ours
am skip reason: subject contains skip directive
Change-Id: I61b8d11bb528f6060442178502a6c80d475c5727
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions