diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 18:47:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 18:47:47 +0000 |
| commit | 604cb1a6875e6e34ce52251bba113c9c447322af (patch) | |
| tree | e1e860dd9301ee20ba44f3f7cb35d8fdefa1f3f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 33a65a6530a99b94b98cf56e4b67e291bbeab700 (diff) | |
| parent | 559601bc20dad8555e8d531ed2742b86161c35e9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 27bb7521ba -s ours am: 559601bc20 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158298
Change-Id: I84c45f8f2c62a4fd43e1bb0f0046288c67e63a92
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions