diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 21:45:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 21:45:25 +0000 |
| commit | 5cfa84197d56ad4d299d3bebcb9a63bf4774d54a (patch) | |
| tree | d63895f679e35a398374afc72208b4350afb9a60 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 90d7f4a7f26ef78b9c375f69506fdce23e1026b4 (diff) | |
| parent | 552d78d3521d36fed7dfe71e94c4b0489b18fd60 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours am: 552d78d352 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684937
Change-Id: I7d0e7d50ae2caf15e50d2ea38cf6816faa69856a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions