diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:45:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:45:07 +0000 |
| commit | 974bfd32a878fe35215f9a9a2358857819211393 (patch) | |
| tree | 5982adea12859b5e7b320020a263b075e9b109b8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 65ba18bb0c95454d407d9ab959b5873980022a05 (diff) | |
| parent | 88199ac614b8a6a915b828260057a43b7ca116c0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ca170d09a -s ours am: 88199ac614 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d31d9da88cde8df37eb0befe550c8b0c4b4935a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions