diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:53:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:53:40 +0000 |
| commit | 559a2b78c5a236728107ea9b39e1ce49a4cbb273 (patch) | |
| tree | 6b1de158b65f8a3444ecd68feca98c6cbb5d33e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5e8994981d9cec36a3c5af40571f7af81787e570 (diff) | |
| parent | 0a7a2021402672b9635f0ec1de4dd7b835502701 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0a7a202140 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14268607
Change-Id: Id74c27017a7db1e45eefd100ec08733e2a0dd8b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions