diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:44:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:44:06 +0000 |
| commit | 6f326f4318f176e8f41821037ad4666fed33d206 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7425a7fcca85c0f2ae33b27a9d3881f1fcd036f8 (diff) | |
| parent | 191ab79cd7fc6aa34747629b1e3d7c83aaae090e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours am: 902c3252ec -s ours am: cfa3fb31ac -s ours am: 191ab79cd7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I299f8b60d226c453349f6099f6998bd6200feb92
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions