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