diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:51:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:51:20 +0000 |
| commit | 72fc9a661a2e112ca604e04cf75f1b106cbb1d1a (patch) | |
| tree | b8c6192c6fe566edb84d8b77c666b3ad98e006df /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 248b4d775a766a07beeafd667b8af73fd5fdcfc8 (diff) | |
| parent | ce03babc79b7bd84c62441305c747c728fa8b7b5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 6be5877928 -s ours am: 8109231b98 -s ours am: ce03babc79 -s ours
am skip reason: subject contains skip directive
Change-Id: I5c4bf385b7a2c7f4d5f5231b8bf60d1f7e4f6483
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions