diff options
| author | Bill Yi <byi@google.com> | 2019-06-29 12:28:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 12:28:02 -0700 |
| commit | c04f152b27cf7c10790432aabe4727e1388d1979 (patch) | |
| tree | 64b369ffb76aec49b75c89319a032dd2ac0474e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 13800491d9b92c2c83bc2f8609760b1b9ae20bd2 (diff) | |
| parent | 680695de8214eadf497ed0971e2b3ab15e10bed1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 680695de82 -s ours
am skip reason: subject contains skip directive
Change-Id: Iff056a5a58b65db6bc2a457936d67615cb650c4b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions