diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:27:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:27:59 +0000 |
| commit | 31268e08d246ce39f6bb0ef8c9794a64ba8eaf53 (patch) | |
| tree | 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d2fdb0c7df8bdf653fb41087dda430a7e70d7682 (diff) | |
| parent | 741bd0cf462d1afeeb3c9c395cfa12f125f9b840 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0774753984 -s ours am: 741bd0cf46 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684411
Change-Id: Ica9380254943a042c06e941f3649e1003855bbd4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions