diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-18 02:37:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 02:37:02 +0000 |
| commit | 82a6e150ee19ce249980055abfb55c5d77868a4c (patch) | |
| tree | 739e43306dd38504a857cf0c5ab6535777f03d33 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 23c7b00cf234c9173c37851495439fbf1b1caf11 (diff) | |
| parent | 1b5d7b4c2a2b7ad9827dbf8557b97b5ef9d31465 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5055cf48b9 -s ours am: 1b5d7b4c2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15599697
Change-Id: I74f91973a77fcf76833f6c5d0231382eb4bce3a5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions