diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:28:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:28:10 +0000 |
| commit | 8d0d3a62a26598a44ca7401c00f1739b4b23c6ed (patch) | |
| tree | fd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0cfbde601151edec47b4c78f16ff0348d2aa76d6 (diff) | |
| parent | 5accf14709761ded4940f250419eaf42dd8032cc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 94ef8f65e4 -s ours am: 5accf14709 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: I44ff595a463cdebfd11c9dc21c31a5545992a5e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions