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