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