diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:28:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:28:44 +0000 |
| commit | 8c4bb51982cd893d5e6dd8be33005ea5fc5e9f0c (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 65cc1e53f9e24b327294e0108d41e0edbda349bb (diff) | |
| parent | f87beda8f2321e1bb2d638af3c652aca2cca428d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: 90c00b9586 -s ours am: f87beda8f2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: Id0cd3f1994bcf36e578c33fb6bcfbc24103a8851
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions