diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 06:19:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 06:19:01 +0000 |
| commit | 0d0dc9fa8b91472ac4ec2547d99335540877995d (patch) | |
| tree | 663453f92f06729f2f865238660bd9f7368dd159 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4ec3aa4d09ff5ef3e88ee60a886da7d248605032 (diff) | |
| parent | b14bdbdd7489e6a7ed1e267996935a83d17d28b0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b14bdbdd74 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12517473
Change-Id: I70bde6982ef131550a8da710687e593e447d227c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions