diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:44:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:44:41 +0000 |
| commit | 28f94dd1ee42cd7f1592920d9457bc08a0ed807c (patch) | |
| tree | f8b97a8a1301ffc77a08f9b17a16d5e1af87b2a7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 058fd42f0a972e3d441549ca4f8187e4f6833230 (diff) | |
| parent | 40b26445f412ce663258681352d901200e63111c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am: d6a61eed90 -s ours am: 40b26445f4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684938
Change-Id: I08b33a2b80167e9988f1926a3cc1e0ef43f06e65
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions