diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:23:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:23:19 +0000 |
| commit | 44d9cd3f52a6b3317ba64049ea92cd6a99ca5a89 (patch) | |
| tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 16df259b0a8d817874aea1a4afc9d9afa212edcc (diff) | |
| parent | 04c0296a72537e3902b46e4cded7366bd4281ab8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: 04c0296a72 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: Ida528ca20a9b991aac66b9bcbe7644d737f8080c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions