diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:51:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:51:08 +0000 |
| commit | 248b4d775a766a07beeafd667b8af73fd5fdcfc8 (patch) | |
| tree | b8c6192c6fe566edb84d8b77c666b3ad98e006df /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7456712f8107bcac4e6a1f2f770755effcd7ede3 (diff) | |
| parent | 5b374c864809dd11c2f8d963c05fbd90c637bb2f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5d2584f6d7 -s ours am: bd112fb44f -s ours am: 5b374c8648 -s ours
am skip reason: subject contains skip directive
Change-Id: If58434964c7cd485cbb579c05eabdde68beaf0ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions