diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:01:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:01:31 +0000 |
| commit | 2bbc0da8b4bdd4fef16283a0dabb2912e7155aef (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7cef22868631d9797e6901c4ca26a0c51196c5d1 (diff) | |
| parent | a78ee128182e30099c64933f59d531d711aa2d9b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours am: a78ee12818 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684412
Change-Id: Id7c733b7e4058e73b068a01330ec2db9a7674efa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions