diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 04:33:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 04:33:15 +0000 |
| commit | 8dc1bc6cbc21f93522b90fa612e4ab4db3078b77 (patch) | |
| tree | fcea5dcf1899ed6e1f93de9ceb1c78e01a61bff2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d49775ea4ce361a04ef894528a4684e0dad5ae8d (diff) | |
| parent | f5693e6cdc0fd79e2d21251e0aeade47fc52c554 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143086
Change-Id: I4f0334c24dc2342ddcd2e52c8c3a4965aa924b77
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions