diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 20:24:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 20:24:50 +0000 |
| commit | 2792895cd51b2c86689bd12aca7062b0f323f160 (patch) | |
| tree | 2318041f4cfe3bd5f18a19c1d35b69d42da57a69 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2b0a36a65c78459e69e106b5678d1420e9993468 (diff) | |
| parent | 87a94d9556755355440a87c49538757fa5549219 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1720a48cb3 -s ours am: 87a94d9556 -s ours
am skip reason: subject contains skip directive
Change-Id: Id6f66e21bd2829bfe3876b633ec9151c6f1d8063
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions