diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 08:36:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 08:36:05 +0000 |
| commit | 56a36854c2069eeb1f82f7881951e0e3f0ec6a07 (patch) | |
| tree | 9f7ed84ff0a448f9da7adf267f25379651ebda49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 47285f6f0d1586089abc721244c0ad717de4a020 (diff) | |
| parent | 47b34e44c335d7d27415274687748ef178819eff (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours am: 47b34e44c3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12164903
Change-Id: I43013c45cbe56ff19b4ddfd00db4c73062944729
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions