diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 21:01:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 21:01:56 +0000 |
| commit | 4cbf21d6070f5032d5f9a1ae660fb2a267900069 (patch) | |
| tree | 2318041f4cfe3bd5f18a19c1d35b69d42da57a69 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2792895cd51b2c86689bd12aca7062b0f323f160 (diff) | |
| parent | 14cb134570d4431697ed1734184f18cd223d7def (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: f76575265c -s ours am: 14cb134570 -s ours
am skip reason: subject contains skip directive
Change-Id: I1f54c9666e7df2063783851d3b56c7e9b60385a9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions