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