diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:42:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:42:57 +0000 |
| commit | 50408197e9cc76faeb4cf4d627d64809b1ad6ea0 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 61c6fd1605b912dd6e51130cf741ccd7638370a6 (diff) | |
| parent | 2750013c8717bd9203d07a70d561b6d54761874c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours am: 2acf4490ca -s ours am: 4367680f47 -s ours am: 2750013c87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I3adc62d0ade693d908e6bf162f56bfb58d934fd5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions