diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:05:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:05:56 +0000 |
commit | 5e65c41e7d062b3c639deab8c2e40a833c173230 (patch) | |
tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 29ff1de466ab990ec11b9b137e98cc1ea72dfbaf (diff) | |
parent | ed11a3ab23c5a8db8f023b75d940c44b0006181a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5b962929bf -s ours am: ed11a3ab23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937074
Change-Id: Ib49d4d9dca73dd333c7df626445777ab177c3310
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions