diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:13:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:13:06 +0000 |
| commit | 8037d5af54a58a6d1ed3397386089e5f5c176efc (patch) | |
| tree | feb4b9596ead498ecdb2dc1bfde5f29a7937e7b0 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f0e2cf7780d5a76f57df5045b64fbface956cb0e (diff) | |
| parent | f3f6295c7fa5999012986d140b6c2a9244949ba1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: f610cd79bd -s ours am: f3f6295c7f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I68fcf44af5d56ff33f767a58074351724e5e2085
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions