diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-24 22:22:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-24 22:22:55 +0000 |
| commit | 7f8ae7ef7c6b25b7110efbbf2db6c2d27752ca27 (patch) | |
| tree | 2f4d9b5cda9b68db4a8b2a8c9376ed3d30330315 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 905c4cd075639d3bb5bf7a429cd592489da46c1e (diff) | |
| parent | 36c598ad9957b8c7ba2135869f1ed733d39c97f5 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 79fd944c1c -s ours am: abbf46c971 -s ours am: 19cf27a741 -s ours" into rvc-qpr-dev-plus-aosp am: 36c598ad99 -s ours
am skip reason: subject contains skip directive
Change-Id: Id8f3b0520c0fa2c7121dd9d0b5c5add1de242232
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions