diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:28:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:28:22 +0000 |
| commit | 1e7fbc3a01d08aaef6b9ca958f6a59672cc2e4e1 (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2750013c8717bd9203d07a70d561b6d54761874c (diff) | |
| parent | 195fb55d9bc3c1733f0e6028bfd92aa6a5cc83cb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: 90c00b9586 -s ours am: 195fb55d9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: Ie1b58327b6c4252618fe133cd15641d3831ff102
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions