diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 00:01:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 00:01:47 +0000 |
| commit | 3fae6d5068ea3371f21ff7711c6c3f666ec698a9 (patch) | |
| tree | 1d2f1d4858e6fedf96a6af91a5f42bf5f1664df4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 119e4645b4cc8147cfc49dc905e01f681b609a3d (diff) | |
| parent | aeaabf847a7de1c93eb07a9711a807fbe6356957 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b1b49973c5 -s ours am: 24bb35c160 -s ours am: b447f33cba -s ours am: e2372efca9 -s ours" into rvc-qpr-dev-plus-aosp am: aeaabf847a -s ours
am skip reason: subject contains skip directive
Change-Id: I554c72c05340fd1a51a40261c5fffd2f8718382f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions